diff options
| author | Chris Lattner <sabre@nondot.org> | 2012-01-23 15:09:44 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2012-01-23 15:09:44 +0000 |
| commit | 95889fa9c31779c9ef3e71d633b8d9146648bc97 (patch) | |
| tree | 45038c033671f5cf3bb392ce7fbee8f6f6bffe64 /lib/VMCore/LLVMContextImpl.h | |
| parent | 25878042030e85c244b41bfcdfad27c32360e2ec (diff) | |
| download | llvm-95889fa9c31779c9ef3e71d633b8d9146648bc97.tar.gz llvm-95889fa9c31779c9ef3e71d633b8d9146648bc97.tar.bz2 llvm-95889fa9c31779c9ef3e71d633b8d9146648bc97.tar.xz | |
revert r148691 and 148693
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@148698 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/VMCore/LLVMContextImpl.h')
| -rw-r--r-- | lib/VMCore/LLVMContextImpl.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/VMCore/LLVMContextImpl.h b/lib/VMCore/LLVMContextImpl.h index 9d8722b272..30f9d46987 100644 --- a/lib/VMCore/LLVMContextImpl.h +++ b/lib/VMCore/LLVMContextImpl.h @@ -27,7 +27,6 @@ #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/FoldingSet.h" -#include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringMap.h" #include <vector> @@ -139,8 +138,7 @@ public: // on Context destruction. SmallPtrSet<MDNode*, 1> NonUniquedMDNodes; - typedef DenseMap<Type*, OwningPtr<ConstantAggregateZero> > CAZMapTy; - CAZMapTy CAZConstants; + ConstantUniqueMap<char, char, Type, ConstantAggregateZero> AggZeroConstants; typedef ConstantUniqueMap<std::vector<Constant*>, ArrayRef<Constant*>, ArrayType, ConstantArray, true /*largekey*/> ArrayConstantsTy; @@ -154,11 +152,9 @@ public: VectorType, ConstantVector> VectorConstantsTy; VectorConstantsTy VectorConstants; - typedef DenseMap<PointerType*, OwningPtr<ConstantPointerNull> > CPNMapTy; - CPNMapTy CPNConstants; - - typedef DenseMap<Type*, OwningPtr<UndefValue> > UVMapTy; - UVMapTy UVConstants; + ConstantUniqueMap<char, char, PointerType, ConstantPointerNull> + NullPtrConstants; + ConstantUniqueMap<char, char, Type, UndefValue> UndefValueConstants; DenseMap<std::pair<Function*, BasicBlock*> , BlockAddress*> BlockAddresses; ConstantUniqueMap<ExprMapKeyType, const ExprMapKeyType&, Type, ConstantExpr> |