Merge pull request swiftlang#40619 from DougGregor/swiftfoundation-nsobject

swift-ci · web-flow · commit 3e98dd4dc042 · 2021-12-17T15:55:26.000-08:00
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -8609,7 +8609,8 @@ bool ClassDecl::isNSObject() const {
   if (!getName().is("NSObject")) return false;
   ASTContext &ctx = getASTContext();
   return (getModuleContext()->getName() == ctx.Id_Foundation ||
-          getModuleContext()->getName() == ctx.Id_ObjectiveC);
+          getModuleContext()->getName() == ctx.Id_ObjectiveC ||
+          getModuleContext()->getName().is("SwiftFoundation"));
 }
 
 Type ClassDecl::getSuperclass() const {

Original file line number	Diff line number	Diff line change
`@@ -8609,7 +8609,8 @@ bool ClassDecl::isNSObject() const {`
`8609`	`8609`	`if (!getName().is("NSObject")) return false;`
`8610`	`8610`	`ASTContext &ctx = getASTContext();`
`8611`	`8611`	`return (getModuleContext()->getName() == ctx.Id_Foundation \|\|`
`8612`		`- getModuleContext()->getName() == ctx.Id_ObjectiveC);`
	`8612`	`+ getModuleContext()->getName() == ctx.Id_ObjectiveC \|\|`
	`8613`	`+ getModuleContext()->getName().is("SwiftFoundation"));`
`8613`	`8614`	`}`
`8614`	`8615`
`8615`	`8616`	`Type ClassDecl::getSuperclass() const {`