Merge pull request #4074 from plotfi/stable/20211026

[c++-interop] Teach APINotes to handle DeclContexts that are extern "C"

Author: zoecarver

clang/lib/Sema/SemaAPINotes.cpp

@@ -810,7 +810,8 @@ void Sema::ProcessAPINotes(Decl *D) {
     return;
 
   // Globals.
-  if (D->getDeclContext()->isFileContext()) {
+  if (D->getDeclContext()->isFileContext() ||
+      D->getDeclContext()->isExternCContext()) {
     // Global variables.
     if (auto VD = dyn_cast<VarDecl>(D)) {
       for (auto Reader : APINotes.findAPINotes(D->getLocation())) {

clang/test/APINotes/Inputs/Frameworks/CXXInteropKit.framework/Headers/CXXInteropKit.apinotes

@@ -0,0 +1,5 @@
+---
+Name: CxxInterop
+Classes:
+- Name: NSSomeClass
+  SwiftName: SomeClass

clang/test/APINotes/Inputs/Frameworks/CXXInteropKit.framework/Headers/CXXInteropKit.h

@@ -0,0 +1,3 @@
+@interface NSSomeClass
+  -(instancetype)init;
+@end

clang/test/APINotes/Inputs/Frameworks/CXXInteropKit.framework/Modules/module.modulemap

@@ -0,0 +1,5 @@
+framework module CxxInteropKit [extern_c] {
+  umbrella header "CxxInteropKit.h"
+  export *
+  module * { export * }
+}

clang/test/APINotes/objcxx-swift-name.m

@@ -0,0 +1,9 @@
+// RUN: rm -rf %t && mkdir -p %t
+// RUN: %clang_cc1 -fmodules -fblocks -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache/CxxInterop -fdisable-module-hash -fapinotes-modules -fsyntax-only -I %S/Inputs/Headers -F %S/Inputs/Frameworks %s -x objective-c++
+// RUN: %clang_cc1 -fmodules -fblocks -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache/CxxInterop -fdisable-module-hash -fapinotes-modules -fsyntax-only -I %S/Inputs/Headers -F %S/Inputs/Frameworks %s -ast-dump -ast-dump-filter SomeClass -x objective-c++ | FileCheck %s
+
+#import <CxxInteropKit/CxxInteropKit.h>
+
+// CHECK: Dumping NSSomeClass:
+// CHECK-NEXT: ObjCInterfaceDecl {{.+}} imported in CxxInteropKit <undeserialized declarations> NSSomeClass
+// CHECK-NEXT: SwiftNameAttr {{.+}} <<invalid sloc>> "SomeClass"