From: Ted Kremenek <kremenek@apple.com>
Date: Thu, 15 Nov 2007 00:05:03 +0000 (+0000)
Subject: Fixed serious bug in BatchReadOwnedPtrs where in a chain of calls to
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7c6ad0c06e911159979c994625fd82c6b8c4b242;p=oota-llvm.git

Fixed serious bug in BatchReadOwnedPtrs where in a chain of calls to
deserialize objects if BatchReadOwnedPtrs was called more than once in the
same call chain then the second call would overwrite the SerializedPtrIDs
being used by the first call. Solved this problem by making the vector that
holds the pointer IDs local to a function call. Now BatchReadOwnedPtrs is
reentrant.


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

diff --git a/include/llvm/Bitcode/Deserialize.h b/include/llvm/Bitcode/Deserialize.h
index 68d94b773d1..d0ededef9fc 100644
--- a/include/llvm/Bitcode/Deserialize.h
+++ b/include/llvm/Bitcode/Deserialize.h
@@ -126,7 +126,6 @@ private:
   unsigned AbbrevNo;
   unsigned RecordCode;
   Location StreamStart;
-  std::vector<SerializedPtrID> BatchIDVec;
   
   //===----------------------------------------------------------===//
   // Public Interface.
@@ -213,7 +212,7 @@ public:
   
   template <typename T>
   void BatchReadOwnedPtrs(unsigned NumPtrs, T** Ptrs, bool AutoRegister=true) {
-    BatchIDVec.clear();
+    llvm::SmallVector<SerializedPtrID,10> BatchIDVec;
     
     for (unsigned i = 0; i < NumPtrs; ++i)
       BatchIDVec.push_back(ReadPtrID());
@@ -234,8 +233,8 @@ public:
   void BatchReadOwnedPtrs(unsigned NumT1Ptrs, T1** Ptrs, T2*& P2,
                           bool A1=true, bool A2=true) {
     
-    BatchIDVec.clear();
-    
+    llvm::SmallVector<SerializedPtrID,10> BatchIDVec;
+
     for (unsigned i = 0; i < NumT1Ptrs; ++i)
       BatchIDVec.push_back(ReadPtrID());
     
@@ -261,7 +260,7 @@ public:
                           T2*& P2, T3*& P3,
                           bool A1=true, bool A2=true, bool A3=true) {
     
-    BatchIDVec.clear();
+    llvm::SmallVector<SerializedPtrID,10> BatchIDVec;
     
     for (unsigned i = 0; i < NumT1Ptrs; ++i)
       BatchIDVec.push_back(ReadPtrID());