Merge pull request #80467 from cachemeifyoucan/eng/PR-148446465

[ExplicitModuleBuild] Don't leak chained bridging header in objc header

Author: cachemeifyoucan

lib/Frontend/Frontend.cpp

@@ -912,14 +912,17 @@ SourceFile *CompilerInstance::getIDEInspectionFile() const {
 
 std::string CompilerInstance::getBridgingHeaderPath() const {
   const FrontendOptions &opts = Invocation.getFrontendOptions();
-  if (opts.ImplicitObjCPCHPath.empty())
+  if (!opts.ModuleHasBridgingHeader)
+    return std::string();
+
+  if (!opts.ImplicitObjCHeaderPath.empty())
     return opts.ImplicitObjCHeaderPath;
 
   auto clangImporter =
       static_cast<ClangImporter *>(getASTContext().getClangModuleLoader());
 
   // No clang importer created. Report error?
-  if (!clangImporter)
+  if (!clangImporter || opts.ImplicitObjCPCHPath.empty())
     return std::string();
 
   return clangImporter->getOriginalSourceFile(opts.ImplicitObjCPCHPath);

test/ScanDependencies/bridging-header-autochaining.swift

@@ -121,8 +121,16 @@
 // RUN: %target-swift-frontend -module-name User -O \
 // RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import -disable-implicit-swift-modules \
 // RUN:   -explicit-swift-module-map-file %t/map3.json @%t/User2.cmd %t/user2.swift \
+// RUN:   -emit-objc-header -emit-objc-header-path %t/User-Swift.h \
 // RUN:   -emit-module -o %t/User2.swiftmodule
 
+/// Generated ObjC Header should reference original header name, not the chained bridging header.
+// RUN: %FileCheck %s --check-prefix OBJC-HEADER --input-file=%t/User-Swift.h
+// OBJC-HEADER: import B
+// OBJC-HEADER: import
+// OBJC-HEADER-SAME: Bridging2.h
+// OBJC-HEADER-NOT: ChainedBridgingHeader.h
+
 // RUN: %target-swift-frontend -scan-dependencies -module-name User -O \
 // RUN:   -disable-implicit-string-processing-module-import -disable-implicit-concurrency-module-import \
 // RUN:   -Xcc -fmodule-map-file=%t/a.modulemap -Xcc -fmodule-map-file=%t/b.modulemap \
@@ -193,6 +201,8 @@ extension Bridging2 {
     public func testA() {}
 }
 
+public class BB : B {}
+public class Foo3 : Bridging2 {}
 
 //--- Bridging.h
 #include "Foo.h"