🍒[APINotes] For a re-exported module, look for APINotes in the re-exporting module's apinotes file

clang/lib/APINotes/APINotesManager.cpp

@@ -251,6 +251,7 @@ llvm::SmallVector<const FileEntry *, 2> APINotesManager::getCurrentModuleAPINote
     Module *module, bool lookInModule, ArrayRef<std::string> searchPaths) {
   FileManager &fileMgr = SourceMgr.getFileManager();
   auto moduleName = module->getTopLevelModuleName();
+  auto ExportedModuleName = module->getTopLevelModule()->ExportAsModule;
   llvm::SmallVector<const FileEntry *, 2> APINotes;
 
   // First, look relative to the module itself.
@@ -263,6 +264,10 @@ llvm::SmallVector<const FileEntry *, 2> APINotesManager::getCurrentModuleAPINote
 
         APINotes.push_back(file);
       }
+      // If module FooCore is re-exported through module Foo, try Foo.apinotes.
+      if (!ExportedModuleName.empty())
+        if (auto File = findAPINotesFile(dir, ExportedModuleName, wantPublic))
+          APINotes.push_back(File);
     };
 
     if (module->IsFramework) {

clang/test/APINotes/Inputs/Headers/ExportAs.apinotes

@@ -0,0 +1,5 @@
+Name: ExportAs
+Globals:
+  - Name: globalInt
+    Availability: none
+    AvailabilityMsg: "oh no"

clang/test/APINotes/Inputs/Headers/ExportAs.h

@@ -0,0 +1 @@
+#include "ExportAsCore.h"

clang/test/APINotes/Inputs/Headers/ExportAsCore.h

@@ -0,0 +1 @@
+static int globalInt = 123;

clang/test/APINotes/Inputs/Headers/module.modulemap

@@ -2,6 +2,16 @@ module ExternCtx {
   header "ExternCtx.h"
 }
 
+module ExportAsCore {
+  header "ExportAsCore.h"
+  export_as ExportAs
+}
+
+module ExportAs {
+  header "ExportAs.h"
+  export *
+}
+
 module HeaderLib {
   header "HeaderLib.h"
 }

clang/test/APINotes/export-as.c

@@ -0,0 +1,8 @@
+// RUN: rm -rf %t && mkdir -p %t
+// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -fmodules-cache-path=%t/ModulesCache -fdisable-module-hash -fapinotes-modules -fsyntax-only -I %S/Inputs/Headers %s -ast-dump -ast-dump-filter globalInt -x c | FileCheck %s
+
+#include "ExportAs.h"
+
+// CHECK: Dumping globalInt:
+// CHECK: VarDecl {{.+}} imported in ExportAsCore globalInt 'int'
+// CHECK: UnavailableAttr {{.+}} <<invalid sloc>> "oh no"