commit 5d28e61143a4acc65487346d43399f4fab6bca94
author swift-ci <swift-ci@users.noreply.github.com> Thu Feb 22 09:56:08 2018 -0800
committer GitHub <noreply@github.com> Thu Feb 22 09:56:08 2018 -0800
tree ce3e35a827d707a5cec8136eb0edcc9212a9f7ad
parent 6a1161bd931afb41f8aa1b76052557893dc14675
parent fa2a5779b17f50260aeaad5d9c3c0062e99f07d2

Merge pull request #14786 from jrose-apple/pch-woes

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());