Fix PCH/preprocess test to be more useful, and unbreak -E mode with implicit
PCH, which I broke.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@86921 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/PCH/preprocess.c b/test/PCH/preprocess.c
index bd91e5c..7a6c2c5 100644
--- a/test/PCH/preprocess.c
+++ b/test/PCH/preprocess.c
@@ -1,5 +1,8 @@
-// RUN: clang-cc -emit-pch -o %t %S/preprocess.h
-// RUN: clang-cc -include-pch %t -E -o - %s | grep -c "a_typedef" | count 1
-#include "preprocess.h"
+// Check that -E mode is invariant when using an implicit PCH.
-int a_value;
+// RUN: clang-cc -include %S/preprocess.h -E -o %t.orig %s
+// RUN: clang-cc -emit-pch -o %t %S/preprocess.h
+// RUN: clang-cc -include-pch %t -E -o %t.from_pch %s
+// RUN: diff %t.orig %t.from_pch
+
+a_typedef a_value;
diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index 784b19e..f6eec11 100644
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -783,7 +783,7 @@
const std::string &ImplicitPCHInclude =
CompOpts.getPreprocessorOpts().getImplicitPCHInclude();
- if (!ImplicitPCHInclude.empty()) {
+ if (Consumer && !ImplicitPCHInclude.empty()) {
// If the user specified -isysroot, it will be used for relocatable PCH
// files.
const char *isysrootPCH = CompOpts.getHeaderSearchOpts().Sysroot.c_str();
@@ -826,6 +826,18 @@
// the source location entries for the PCH file.
if (InitializeSourceManager(PP, InFile))
return;
+ } else if (!ImplicitPCHInclude.empty()) {
+ // If we have an implicit PCH, the source manager initialization was
+ // delayed, do it now.
+ //
+ // FIXME: Clean this up.
+
+ // Finish preprocessor initialization. We do this now (rather
+ // than earlier) because this initialization creates new source
+ // location entries in the source manager, which must come after
+ // the source location entries for the PCH file.
+ if (InitializeSourceManager(PP, InFile))
+ return;
}
// If we have an ASTConsumer, run the parser with it.