[cfe-commits] r166653 - /cfe/trunk/lib/Serialization/ASTReader.cpp

[Douglas Gregor]

Author: dgregor
Date: Wed Oct 24 19:25:27 2012
New Revision: 166653

URL: http://llvm.org/viewvc/llvm-project?rev=166653&view=rev
Log:
Fix computation of predefines buffer from the preprocessor-option
checking, and disable the old predefines-buffer-diff'ing code path.

Modified:
    cfe/trunk/lib/Serialization/ASTReader.cpp

Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=166653&r1=166652&r2=166653&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Wed Oct 24 19:25:27 2012
@@ -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;
 }