[polly] r246390 - getNewScalarValue: Get ScalarMap directly from member variable [NFC]

[Tobias Grosser via llvm-commits]

Author: grosser
Date: Sun Aug 30 12:37:55 2015
New Revision: 246390

URL: http://llvm.org/viewvc/llvm-project?rev=246390&view=rev
Log:
getNewScalarValue: Get ScalarMap directly from member variable [NFC]

There is no need to pass the ScalarMap to getNewScalarValue as this
map is (indirectly) used when calling getOrCreateScalarAlloca.

Modified:
    polly/trunk/include/polly/CodeGen/BlockGenerators.h
    polly/trunk/lib/CodeGen/BlockGenerators.cpp

Modified: polly/trunk/include/polly/CodeGen/BlockGenerators.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/CodeGen/BlockGenerators.h?rev=246390&r1=246389&r2=246390&view=diff
==============================================================================
--- polly/trunk/include/polly/CodeGen/BlockGenerators.h (original)
+++ polly/trunk/include/polly/CodeGen/BlockGenerators.h Sun Aug 30 12:37:55 2015
@@ -498,7 +498,6 @@ protected:
   ///
   /// @param ScalarValue The original value needed.
   /// @param R           The current SCoP region.
-  /// @param ReloadMap   The scalar map for demoted values.
   /// @param BBMap       A mapping from old values to their new values
   ///                    (for values recalculated within this basic block).
   /// @param GlobalMap   A mapping from old values to their new values
@@ -507,8 +506,7 @@ protected:
   ///
   /// @returns The newest version (e.g., reloaded) of the scalar value.
   Value *getNewScalarValue(Value *ScalarValue, const Region &R,
-                           ScalarAllocaMapTy &ReloadMap, ValueMapT &BBMap,
-                           ValueMapT &GlobalMap);
+                           ValueMapT &BBMap, ValueMapT &GlobalMap);
 };
 
 /// @brief Generate a new vector basic block for a polyhedral statement.

Modified: polly/trunk/lib/CodeGen/BlockGenerators.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/BlockGenerators.cpp?rev=246390&r1=246389&r2=246390&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/BlockGenerators.cpp (original)
+++ polly/trunk/lib/CodeGen/BlockGenerators.cpp Sun Aug 30 12:37:55 2015
@@ -407,7 +407,6 @@ void BlockGenerator::generateScalarLoads
 }
 
 Value *BlockGenerator::getNewScalarValue(Value *ScalarValue, const Region &R,
-                                         ScalarAllocaMapTy &ReloadMap,
                                          ValueMapT &BBMap,
                                          ValueMapT &GlobalMap) {
   // If the value we want to store is an instruction we might have demoted it
@@ -438,9 +437,8 @@ Value *BlockGenerator::getNewScalarValue
     return /* Case (3a) */ ScalarValueCopy;
 
   // Case (3b)
-  Value *ReloadAddr = getOrCreateAlloca(ScalarValueInst, ReloadMap, ".s2a");
-  ScalarValue =
-      Builder.CreateLoad(ReloadAddr, ReloadAddr->getName() + ".reload");
+  Value *Address = getOrCreateScalarAlloca(ScalarValueInst);
+  ScalarValue = Builder.CreateLoad(Address, Address->getName() + ".reload");
 
   return ScalarValue;
 }
@@ -461,7 +459,7 @@ void BlockGenerator::generateScalarStore
     Value *Val = MA->getAccessValue();
     auto *Address = getOrCreateAlloca(*MA);
 
-    Val = getNewScalarValue(Val, R, ScalarMap, BBMap, GlobalMap);
+    Val = getNewScalarValue(Val, R, BBMap, GlobalMap);
     Builder.CreateStore(Val, Address);
   }
 }
@@ -1087,7 +1085,7 @@ void RegionGenerator::generateScalarStor
 
     auto Address = getOrCreateAlloca(*MA);
 
-    Val = getNewScalarValue(Val, R, ScalarMap, BBMap, GlobalMap);
+    Val = getNewScalarValue(Val, R, BBMap, GlobalMap);
     Builder.CreateStore(Val, Address);
   }
 }