Consolidate the different ValueMapTypes we are using

There have been various places where llvm::DenseMap<const llvm::Value *,
llvm::Value *> types have been defined, but all types have been expected to be
identical. We make this more clear by consolidating the different types and use
BlockGenerator::ValueMapT wherever there is a need for types to match
BlockGenerator::ValueMapT.

llvm-svn: 249264

1 files changed, 6 insertions, 3 deletions

diff --git a/polly/lib/Support/ScopHelper.cpp b/polly/lib/Support/ScopHelper.cpp
index 89c4fa33dca..cc41d4812f7 100644
--- a/polly/lib/Support/ScopHelper.cpp
+++ b/polly/lib/Support/ScopHelper.cpp
@@ -240,6 +240,8 @@ void polly::splitEntryBlockForAlloca(BasicBlock *EntryBlock, Pass *P) {
 struct ScopExpander : SCEVVisitor<ScopExpander, const SCEV *> {
   friend struct SCEVVisitor<ScopExpander, const SCEV *>;
 
+  typedef llvm::DenseMap<const llvm::Value *, llvm::Value *> ValueMapT;
+
   explicit ScopExpander(const Region &R, ScalarEvolution &SE,
                         const DataLayout &DL, const char *Name, ValueMapT *VMap)
       : Expander(SCEVExpander(SE, DL, Name)), SE(SE), Name(Name), R(R),
@@ -340,9 +342,10 @@ private:
   ///}
 };
 
-Value *polly::expandCodeFor(Scop &S, ScalarEvolution &SE, const DataLayout &DL,
-                            const char *Name, const SCEV *E, Type *Ty,
-                            Instruction *IP, ValueMapT *VMap) {
+Value *
+polly::expandCodeFor(Scop &S, ScalarEvolution &SE, const DataLayout &DL,
+                     const char *Name, const SCEV *E, Type *Ty, Instruction *IP,
+                     llvm::DenseMap<const llvm::Value *, llvm::Value *> *VMap) {
   ScopExpander Expander(S.getRegion(), SE, DL, Name, VMap);
   return Expander.expandCodeFor(E, Ty, IP);
 }