From: Douglas Gregor <dgregor@apple.com>
Date: Thu, 17 Nov 2011 01:44:33 +0000 (+0000)
Subject: Try to appease the failing buildbot where I can't reproduce the problem
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35f9ae6dd221bd403299a895e97aaaf63507287a;p=clang

Try to appease the failing buildbot where I can't reproduce the problem

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@144879 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 0b2a884f82..b9120ed227 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -1147,8 +1147,10 @@ ASTReader::ASTReadResult ASTReader::ReadSLocEntryRecord(int ID) {
                                                              NumFileDecls));
     }
     
-    if (OverriddenBuffer &&
-        !SourceMgr.getOrCreateContentCache(File)->BufferOverridden) {
+    const SrcMgr::ContentCache *ContentCache
+      = SourceMgr.getOrCreateContentCache(File);
+    if (OverriddenBuffer && !ContentCache->BufferOverridden &&
+        ContentCache->ContentsEntry == ContentCache->OrigEntry) {
       unsigned Code = SLocEntryCursor.ReadCode();
       Record.clear();
       unsigned RecCode