2 files changed, 9 insertions, 5 deletions
diff --git a/polly/include/polly/CodeGen/IRBuilder.h b/polly/include/polly/CodeGen/IRBuilder.h
index 6ebb88385df..151975a0abc 100644
--- a/polly/include/polly/CodeGen/IRBuilder.h
+++ b/polly/include/polly/CodeGen/IRBuilder.h
@@ -72,7 +72,8 @@ public:
   ///
   /// @param NewMap A map from new base pointers to original base pointers.
   void addAlternativeAliasBases(
-      llvm::ValueMap<llvm::Value *, llvm::Value *> &NewMap) {
+      llvm::DenseMap<llvm::AssertingVH<llvm::Value>,
+                     llvm::AssertingVH<llvm::Value>> &NewMap) {
     AlternativeAliasBases.insert(NewMap.begin(), NewMap.end());
   }
 
@@ -93,12 +94,14 @@ private:
   llvm::MDNode *AliasScopeDomain;
 
   /// @brief A map from base pointers to its alias scope.
-  llvm::DenseMap<llvm::Value *, llvm::MDNode *> AliasScopeMap;
+  llvm::DenseMap<llvm::AssertingVH<llvm::Value>, llvm::MDNode *> AliasScopeMap;
 
   /// @brief A map from base pointers to an alias scope list of other pointers.
-  llvm::DenseMap<llvm::Value *, llvm::MDNode *> OtherAliasScopeListMap;
+  llvm::DenseMap<llvm::AssertingVH<llvm::Value>, llvm::MDNode *>
+      OtherAliasScopeListMap;
 
-  llvm::ValueMap<llvm::Value *, llvm::Value *> AlternativeAliasBases;
+  llvm::DenseMap<llvm::AssertingVH<llvm::Value>, llvm::AssertingVH<llvm::Value>>
+      AlternativeAliasBases;
 };
 
 /// @brief Add Polly specifics when running IRBuilder.
diff --git a/polly/include/polly/CodeGen/LoopGenerators.h b/polly/include/polly/CodeGen/LoopGenerators.h
index f9e57b268c6..a0fbf7148e6 100644
--- a/polly/include/polly/CodeGen/LoopGenerators.h
+++ b/polly/include/polly/CodeGen/LoopGenerators.h
@@ -96,7 +96,8 @@ Value *createLoop(Value *LowerBound, Value *UpperBound, Value *Stride,
 ///   }
 class ParallelLoopGenerator {
 public:
-  using ValueToValueMapTy = llvm::ValueMap<Value *, Value *>;
+  using ValueToValueMapTy =
+      llvm::DenseMap<AssertingVH<Value>, AssertingVH<Value>>;
 
   /// @brief Create a parallel loop generator for the current function.
   ParallelLoopGenerator(PollyIRBuilder &Builder, Pass *P, LoopInfo &LI,