1 files changed, 1 insertions, 4 deletions
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;