Revert "unique_ptrify LLVMContextImpl::CAZConstants"

[oota-llvm.git] / lib / IR / LLVMContextImpl.h

diff --git a/lib/IR/LLVMContextImpl.h b/lib/IR/LLVMContextImpl.h
index 65d6774e3357c30acb4ba9890f777450b4169980..7a298cfecf31cf27e19253bf755adcf4805cf3bb 100644 (file)
--- a/lib/IR/LLVMContextImpl.h
+++ b/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;