Fix computation of predefines buffer from the preprocessor-option
checking, and disable the old predefines-buffer-diff'ing code path.
llvm-svn: 166653
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index 7e768c6..d246569 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -277,6 +277,7 @@
} else {
SuggestedPredefines += "#define ";
SuggestedPredefines += MacroName.str();
+ SuggestedPredefines += ' ';
SuggestedPredefines += Existing.first.str();
SuggestedPredefines += '\n';
}
@@ -1026,16 +1027,6 @@
/// \brief Tell the AST listener about the predefines buffers in the chain.
bool ASTReader::CheckPredefinesBuffers(bool Complain) {
- if (Listener) {
- // We only care about the primary module.
- ModuleFile &M = ModuleMgr.getPrimaryModule();
- SuggestedPredefines.clear();
- return Listener->ReadPredefinesBuffer(PCHPredefinesBuffers,
- M.ActualOriginalSourceFileName,
- SuggestedPredefines,
- FileMgr,
- Complain);
- }
return false;
}