commit b06e71b95c1c26367b54a4f2be5356217cb19f09
author Tobias Grosser <grosser@fim.uni-passau.de> Sun Sep 04 11:45:34 2011 +0000
committer Tobias Grosser <grosser@fim.uni-passau.de> Sun Sep 04 11:45:34 2011 +0000
tree 95514eb0b8db03c9b88cfc9c09d8ab6dba067e56
parent 09c571008b7bdf4983c3e82d9125ca513a6891bd

CodeGeneration: Simplify code, fix style.

llvm-svn: 139094

polly/lib/CodeGeneration.cpp

diff --git a/polly/lib/CodeGeneration.cpp b/polly/lib/CodeGeneration.cpp
index e4b6b83..01bbaae 100644
--- a/polly/lib/CodeGeneration.cpp
+++ b/polly/lib/CodeGeneration.cpp
@@ -483,26 +483,23 @@
   }
 
   void copyInstScalar(const Instruction *Inst, ValueMapT &BBMap,
-                      ValueMapT &vectorMap, VectorValueMapT &scalarMaps) {
+                      ValueMapT &VectorMap) {
     Instruction *NewInst = Inst->clone();
 
-    // Copy the operands in temporary vector, as an in place update
-    // fails if an instruction is referencing the same operand twice.
-    std::vector<Value*> Operands(NewInst->op_begin(), NewInst->op_end());
-
     // Replace old operands with the new ones.
-    for (std::vector<Value*>::iterator UI = Operands.begin(),
-         UE = Operands.end(); UI != UE; ++UI) {
-      Value *newOperand = getOperand(*UI, BBMap);
+    for (Instruction::const_op_iterator OI = Inst->op_begin(),
+         OE = Inst->op_end(); OI != OE; ++OI) {
+      Value *OldOperand = *OI;
+      Value *NewOperand = getOperand(OldOperand, BBMap);
 
-      if (!newOperand) {
+      if (!NewOperand) {
         assert(!isa<StoreInst>(NewInst)
                && "Store instructions are always needed!");
         delete NewInst;
         return;
       }
 
-      NewInst->replaceUsesOfWith(*UI, newOperand);
+      NewInst->replaceUsesOfWith(OldOperand, NewOperand);
     }
 
     Builder.Insert(NewInst);
@@ -544,7 +541,7 @@
         return;
       }
 
-    copyInstScalar(Inst, BBMap, vectorMap, scalarMaps);
+    copyInstScalar(Inst, BBMap, vectorMap);
   }
 
   int getVectorSize() {