[apinotes] Add support for global functions in namespaces.

Author: zoecarver

clang/lib/Sema/SemaAPINotes.cpp

@@ -835,18 +835,6 @@ void Sema::ProcessAPINotes(Decl *D) {
       return;
     }
 
-    // Global functions.
-    if (auto FD = dyn_cast<FunctionDecl>(D)) {
-      if (FD->getDeclName().isIdentifier()) {
-        for (auto Reader : APINotes.findAPINotes(D->getLocation())) {
-          auto Info = Reader->lookupGlobalFunction(FD->getName());
-          ProcessVersionedAPINotes(*this, FD, Info);
-        }
-      }
-
-      return;
-    }
-
     // Objective-C classes.
     if (auto Class = dyn_cast<ObjCInterfaceDecl>(D)) {
       for (auto Reader : APINotes.findAPINotes(D->getLocation())) {
@@ -946,6 +934,31 @@ void Sema::ProcessAPINotes(Decl *D) {
       auto Info = Reader->lookupMemberFunction(Name);
       ProcessVersionedAPINotes(*this, Method, Info);
     }
+
+    return;
+  }
+
+  // Global functions.
+  if (auto FD = dyn_cast<FunctionDecl>(D)) {
+    if (FD->getDeclName().isIdentifier()) {
+      for (auto Reader : APINotes.findAPINotes(D->getLocation())) {
+        std::string Name = FD->getName().str();
+
+        auto parent = FD->getParent();
+        while (isa<clang::NamespaceDecl>(parent)) {
+          if (auto Namespace = dyn_cast<clang::NamespaceDecl>(parent)) {
+            Name = Namespace->getNameAsString() + "." + Name;
+          }
+
+          parent = parent->getParent();
+        }
+
+        auto Info = Reader->lookupGlobalFunction(Name);
+        ProcessVersionedAPINotes(*this, FD, Info);
+      }
+    }
+
+    return;
   }
 
   if (auto Namespace = dyn_cast<NamespaceDecl>(D)) {
@@ -954,6 +967,8 @@ void Sema::ProcessAPINotes(Decl *D) {
         ProcessAPINotes(Member);
       }
     }
+
+    return;
   }
 
   // Enumerators.

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

@@ -20,4 +20,7 @@ Tags:
 - Name: ParentNS.ChildNS.ParentStruct.ChildStruct
   Methods:
     - Name: 'method'
-      SwiftName: nestedMethod()
+      SwiftName: nestedMethod()
+Functions:
+- Name: ParentNS.ChildNS.gloablFnInNS
+  SwiftName: childFnInNS()

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

@@ -30,6 +30,8 @@ struct GlobalStruct {
 namespace ParentNS {
 namespace ChildNS {
 
+void gloablFnInNS();
+
 struct ParentStruct {
   int x;
   struct ChildStruct {

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

@@ -2,6 +2,7 @@
 // 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
 // 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 method -x objective-c++ | FileCheck -check-prefix=CHECK-METHOD %s
+// 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 gloablFnInNS -x objective-c++ | FileCheck -check-prefix=CHECK-FN %s
 // 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 "(anonymous)" -x objective-c++ | FileCheck -check-prefix=CHECK-ANONYMOUS-ENUM %s
 
 #import <CXXInteropKit/CXXInteropKit.h>
@@ -24,6 +25,9 @@
 // CHECK-METHOD: Dumping ParentNS::ChildNS::ParentStruct::ChildStruct::method:
 // CHECK-METHOD: SwiftNameAttr {{.+}} <<invalid sloc>> "nestedMethod()"
 
+// CHECK-FN: Dumping ParentNS::ChildNS::gloablFnInNS:
+// CHECK-FN: SwiftNameAttr {{.+}} <<invalid sloc>> "childFnInNS()"
+
 // CHECK-ANONYMOUS-ENUM: Dumping (anonymous):
 // CHECK-ANONYMOUS-ENUM-NEXT: EnumDecl {{.+}} imported in CXXInteropKit <undeserialized declarations> 'NSSomeEnumOptions':'unsigned long'
 // CHECK-ANONYMOUS-ENUM-NEXT: SwiftNameAttr {{.+}} <<invalid sloc>> "SomeEnum.Options"