Merge pull request swiftlang#28776 from DougGregor/clang-diag-consumer-bridging-pch

Author: swift-ci

lib/ClangImporter/ClangImporter.cpp

@@ -800,6 +800,11 @@ bool ClangImporter::canReadPCH(StringRef PCHFilename) {
   auto FID = clangSrcMgr.createFileID(
                         llvm::make_unique<ZeroFilledMemoryBuffer>(1, "<main>"));
   clangSrcMgr.setMainFileID(FID);
+  auto &diagConsumer = CI.getDiagnosticClient();
+  diagConsumer.BeginSourceFile(CI.getLangOpts());
+  SWIFT_DEFER {
+    diagConsumer.EndSourceFile();
+  };
 
   // Pass in TU_Complete, which is the default mode for the Preprocessor
   // constructor and the right one for reading a PCH.

test/ClangImporter/Inputs/ModuleMapWarning/PrivateWarning.framework/Headers/PrivateWarning.h

@@ -0,0 +1 @@
+/* No content */

test/ClangImporter/Inputs/ModuleMapWarning/PrivateWarning.framework/Modules/module.modulemap

@@ -0,0 +1,3 @@
+framework module PrivateWarning {
+  header "PrivateWarning.h"
+}

test/ClangImporter/Inputs/ModuleMapWarning/PrivateWarning.framework/Modules/module.private.modulemap

@@ -0,0 +1,3 @@
+framework module PrivateWarning.Private {
+  header "PrivateWarning_Private.h"
+}

test/ClangImporter/Inputs/ModuleMapWarning/PrivateWarning.framework/PrivateHeaders/PrivateWarning_Private.h

@@ -0,0 +1 @@
+/* No content */

test/ClangImporter/Inputs/ModuleMapWarning/bridging-pch.h

@@ -0,0 +1,2 @@
+@import PrivateWarning;
+@import PrivateWarning.Private;

test/ClangImporter/pch-bridging-header-module-map-diags.swift

@@ -0,0 +1,13 @@
+// RUN: rm -f %t.*
+// REQUIRES: objc_interop
+
+// Build a bridging PCH for involving a module map that contains a warning
+// RUN: %target-swift-frontend -F %S/Inputs/ModuleMapWarning -emit-pch %S/Inputs/ModuleMapWarning/bridging-pch.h -pch-output-dir %t/pch 2> %t.stderr
+// RUN: %FileCheck %s < %t.stderr
+
+// CHECK: module.private.modulemap:1:33: warning: private submodule 'PrivateWarning.Private' in private module map, expected top-level module
+
+// Check that loading that bridging PCH Does not crash the compiler.
+// RUN: %target-swift-frontend -F %S/Inputs/ModuleMapWarning -import-objc-header %S/Inputs/ModuleMapWarning/bridging-pch.h -pch-output-dir %t/pch -typecheck %s
+
+