diff options
| -rw-r--r-- | llvm/lib/IR/Constants.cpp | 8 | ||||
| -rw-r--r-- | llvm/lib/IR/LLVMContextImpl.cpp | 2 | ||||
| -rw-r--r-- | llvm/lib/IR/LLVMContextImpl.h | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/llvm/lib/IR/Constants.cpp b/llvm/lib/IR/Constants.cpp index bc51be6259b..e0cb835c2c6 100644 --- a/llvm/lib/IR/Constants.cpp +++ b/llvm/lib/IR/Constants.cpp @@ -1330,12 +1330,12 @@ bool ConstantFP::isValueValidForType(Type *Ty, const APFloat& Val) { ConstantAggregateZero *ConstantAggregateZero::get(Type *Ty) { assert((Ty->isStructTy() || Ty->isArrayTy() || Ty->isVectorTy()) && "Cannot create an aggregate zero of non-aggregate type!"); - - auto &Entry = Ty->getContext().pImpl->CAZConstants[Ty]; + + ConstantAggregateZero *&Entry = Ty->getContext().pImpl->CAZConstants[Ty]; if (!Entry) - Entry.reset(new ConstantAggregateZero(Ty)); + Entry = new ConstantAggregateZero(Ty); - return Entry.get(); + return Entry; } /// destroyConstant - Remove the constant from the constant table. diff --git a/llvm/lib/IR/LLVMContextImpl.cpp b/llvm/lib/IR/LLVMContextImpl.cpp index 1335b3d33b8..3fd0bb37a4d 100644 --- a/llvm/lib/IR/LLVMContextImpl.cpp +++ b/llvm/lib/IR/LLVMContextImpl.cpp @@ -87,7 +87,7 @@ LLVMContextImpl::~LLVMContextImpl() { ArrayConstants.freeConstants(); StructConstants.freeConstants(); VectorConstants.freeConstants(); - CAZConstants.clear(); + DeleteContainerSeconds(CAZConstants); DeleteContainerSeconds(CPNConstants); DeleteContainerSeconds(UVConstants); InlineAsms.freeConstants(); diff --git a/llvm/lib/IR/LLVMContextImpl.h b/llvm/lib/IR/LLVMContextImpl.h index 65d6774e335..7a298cfecf3 100644 --- a/llvm/lib/IR/LLVMContextImpl.h +++ b/llvm/lib/IR/LLVMContextImpl.h @@ -299,10 +299,7 @@ public: // on Context destruction. SmallPtrSet<GenericMDNode *, 1> NonUniquedMDNodes; - // Value is indirected through pointer to keep pointer validity over mutations - // of this map. Replace if/when we have an efficient map that guarantees - // pointer validity over mutations. - DenseMap<Type*, std::unique_ptr<ConstantAggregateZero>> CAZConstants; + DenseMap<Type*, ConstantAggregateZero*> CAZConstants; typedef ConstantUniqueMap<ConstantArray> ArrayConstantsTy; ArrayConstantsTy ArrayConstants; |
