commit a4288c4aa05075cd45fd4de61d95ffe920fe6441
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Sat Dec 10 01:38:26 2011 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Sat Dec 10 01:38:26 2011 +0000
tree 4b9cace9d3b22b2aebdb499d8125f967ea361719
parent 9aab9c4116bb3ea876d92d4af10bff7f4c451f24

In ContentCache::replaceBuffer, add sanity check to make sure that we do not free a buffer
and then continue using it. rdar://10359140.

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

lib/Basic/SourceManager.cpp

diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index 85fe474..18026db 100644
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -71,7 +71,11 @@
 
 void ContentCache::replaceBuffer(const llvm::MemoryBuffer *B,
                                  bool DoNotFree) {
-  assert(B != Buffer.getPointer());
+  if (B == Buffer.getPointer()) {
+    assert(0 && "Replacing with the same buffer");
+    Buffer.setInt(DoNotFree? DoNotFreeFlag : 0);
+    return;
+  }
   
   if (shouldFreeBuffer())
     delete Buffer.getPointer();