Allow SwiftFoundation to declare NSObject, too

DougGregor · DougGregor · commit 78aa68e07075 · 2021-12-18T17:28:23.000-08:00
Fixes rdar://86495060. (cherry picked from commit fd41366)
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -8589,7 +8589,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
`@@ -8589,7 +8589,8 @@ bool ClassDecl::isNSObject() const {`
`8589`	`8589`	`if (!getName().is("NSObject")) return false;`
`8590`	`8590`	`ASTContext &ctx = getASTContext();`
`8591`	`8591`	`return (getModuleContext()->getName() == ctx.Id_Foundation \|\|`
`8592`		`- getModuleContext()->getName() == ctx.Id_ObjectiveC);`
	`8592`	`+ getModuleContext()->getName() == ctx.Id_ObjectiveC \|\|`
	`8593`	`+ getModuleContext()->getName().is("SwiftFoundation"));`
`8593`	`8594`	`}`
`8594`	`8595`
`8595`	`8596`	`Type ClassDecl::getSuperclass() const {`