1 files changed, 20 insertions, 17 deletions

diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp
index d375dcf4a9..b69e0a181e 100644
--- a/lib/Transforms/Scalar/IndVarSimplify.cpp
+++ b/lib/Transforms/Scalar/IndVarSimplify.cpp
@@ -390,10 +390,8 @@ void IndVarSimplify::runOnLoop(Loop *L) {
   // Compute the type of the largest recurrence expression.
   //
   const Type *LargestType = IndVars[0].first->getType();
-  bool DifferingSizes = false;
   for (unsigned i = 1, e = IndVars.size(); i != e; ++i) {
     const Type *Ty = IndVars[i].first->getType();
-    DifferingSizes |= Ty->getPrimitiveSize() != LargestType->getPrimitiveSize();
     if (Ty->getPrimitiveSize() > LargestType->getPrimitiveSize())
       LargestType = Ty;
   }
@@ -411,30 +409,35 @@ void IndVarSimplify::runOnLoop(Loop *L) {
   if (!isa<SCEVCouldNotCompute>(IterationCount))
     LinearFunctionTestReplace(L, IterationCount, Rewriter);
 
-#if 0
-  // If there were induction variables of other sizes, cast the primary
-  // induction variable to the right size for them, avoiding the need for the
-  // code evaluation methods to insert induction variables of different sizes.
-  // FIXME!
-  if (DifferingSizes) {
-    std::map<unsigned, Value*> InsertedSizes;
-    for (unsigned i = 0, e = IndVars.size(); i != e; ++i) {
-    }    
-  }
-#endif
-
   // Now that we have a canonical induction variable, we can rewrite any
   // recurrences in terms of the induction variable.  Start with the auxillary
   // induction variables, and recursively rewrite any of their uses.
   BasicBlock::iterator InsertPt = Header->begin();
   while (isa<PHINode>(InsertPt)) ++InsertPt;
 
+  // If there were induction variables of other sizes, cast the primary
+  // induction variable to the right size for them, avoiding the need for the
+  // code evaluation methods to insert induction variables of different sizes.
+  std::map<unsigned, Value*> InsertedSizes;
+  InsertedSizes[LargestType->getPrimitiveSize()] = IndVar;
   while (!IndVars.empty()) {
     PHINode *PN = IndVars.back().first;
-    Value *NewVal = Rewriter.ExpandCodeFor(IndVars.back().second, InsertPt,
-                                           PN->getType());
+
+    const Type *Ty = PN->getType()->getUnsignedVersion();
+    Value *&IV = InsertedSizes[Ty->getPrimitiveSize()];
+    if (IV == 0) {
+      // Insert a new cast instruction, which will hold this recurrence.
+      std::string Name = PN->getName();
+      PN->setName("");
+      IV = new CastInst(IndVar, Ty, Name, InsertPt);
+    }
+
+    Value *V = IV;
+    if (PN->getType() != Ty)
+      V = new CastInst(V, PN->getType(), V->getName(), InsertPt);
+
     // Replace the old PHI Node with the inserted computation.
-    PN->replaceAllUsesWith(NewVal);
+    PN->replaceAllUsesWith(V);
     DeadInsts.insert(PN);
     IndVars.pop_back();
     ++NumRemoved;