[llvm-branch-commits] [cfe-branch] r115277 - /cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Sep 30 22:42:03 2010
New Revision: 115277

URL: http://llvm.org/viewvc/llvm-project?rev=115277&view=rev
Log:
Merge r114922:
--
Author: Sebastian Redl <sebastian.redl at getdesigned.at>
Date:   Mon Sep 27 23:20:01 2010 +0000

    My previous fix was incorrect for non-chained PCH reuse. Fix again.

Modified:
    cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp

Modified: cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp?rev=115277&r1=115276&r2=115277&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Serialization/ASTWriter.cpp Thu Sep 30 22:42:03 2010
@@ -1334,7 +1334,7 @@
   // If the preprocessor has a preprocessing record, emit it.
   unsigned NumPreprocessingRecords = 0;
   if (PPRec) {
-    unsigned IndexBase = PPRec->getNumPreallocatedEntities();
+    unsigned IndexBase = Chain ? PPRec->getNumPreallocatedEntities() : 0;
     for (PreprocessingRecord::iterator E = PPRec->begin(Chain),
                                        EEnd = PPRec->end(Chain);
          E != EEnd; ++E) {