commit fa2a5779b17f50260aeaad5d9c3c0062e99f07d2
author Bruno Cardoso Lopes <bruno.cardoso@gmail.com> Wed Feb 22 10:50:28 2017 -0800
committer Jordan Rose <jordan_rose@apple.com> Thu Feb 22 09:59:46 2018 -0700
tree 6512d8bebb33fab92cf3d5085fb633ef0064b351
parent 143c39bd7c3972f3416b83ac9366c93135319cf7

ClangImporter: Update Swift for changes in clang (PCH + Modules issues)

This sets the NeededByPCHOrCompilationUsesPCH language option when
emitting a brigding PCH.

rdar://problem/35056912
rdar://problem/30384801

Initial patch by Adrian Prantl

(cherry picked from commit 5d5f542fe47668f80a4661ccccdb0048c9629a39)

lib/ClangImporter/ClangImporter.cpp

diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp
index 666fab4..b2d18ca 100644
--- a/lib/ClangImporter/ClangImporter.cpp
+++ b/lib/ClangImporter/ClangImporter.cpp
@@ -995,6 +995,7 @@
   if (importerOpts.Mode == ClangImporterOptions::Modes::EmbedBitcode)
     return importer;
 
+  instance.getLangOpts().NeededByPCHOrCompilationUsesPCH = true;
   bool canBegin = action->BeginSourceFile(instance,
                                           instance.getFrontendOpts().Inputs[0]);
   if (!canBegin)
@@ -1373,6 +1374,7 @@
   invocation->getFrontendOpts().OutputFile = outputPCHPath;
   invocation->getFrontendOpts().ProgramAction = clang::frontend::GeneratePCH;
   invocation->getPreprocessorOpts().resetNonModularOptions();
+  invocation->getLangOpts()->NeededByPCHOrCompilationUsesPCH = true;
 
   clang::CompilerInstance emitInstance(
     Impl.Instance->getPCHContainerOperations());