Allow SwiftFoundation to declare NSObject, too

DougGregor · DougGregor · commit fd413664ae18 · 2021-12-17T13:17:32.000-08:00
Fixes rdar://86495060.
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -8584,7 +8584,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
`@@ -8584,7 +8584,8 @@ bool ClassDecl::isNSObject() const {`
`8584`	`8584`	`if (!getName().is("NSObject")) return false;`
`8585`	`8585`	`ASTContext &ctx = getASTContext();`
`8586`	`8586`	`return (getModuleContext()->getName() == ctx.Id_Foundation \|\|`
`8587`		`- getModuleContext()->getName() == ctx.Id_ObjectiveC);`
	`8587`	`+ getModuleContext()->getName() == ctx.Id_ObjectiveC \|\|`
	`8588`	`+ getModuleContext()->getName().is("SwiftFoundation"));`
`8588`	`8589`	`}`
`8589`	`8590`
`8590`	`8591`	`Type ClassDecl::getSuperclass() const {`