[llvm-commits] [release_13] CVS: llvm/lib/Transforms/ExprTypeConvert.cpp LevelRaise.cpp

[John Criswell]

Changes in directory llvm/lib/Transforms:

ExprTypeConvert.cpp updated: 1.96 -> 1.96.2.1
LevelRaise.cpp updated: 1.100 -> 1.100.2.1
---
Log message:

Merged in changes Chris commited over the weekend.  Merge done on August 9,
2004.


---
Diffs of the changes:  (+4 -4)

Index: llvm/lib/Transforms/ExprTypeConvert.cpp
diff -u llvm/lib/Transforms/ExprTypeConvert.cpp:1.96 llvm/lib/Transforms/ExprTypeConvert.cpp:1.96.2.1
--- llvm/lib/Transforms/ExprTypeConvert.cpp:1.96	Thu Jul 29 07:17:34 2004
+++ llvm/lib/Transforms/ExprTypeConvert.cpp	Mon Aug  9 10:35:51 2004
@@ -151,7 +151,7 @@
   // If it's a constant... all constants can be converted to a different
   // type.
   //
-  if (Constant *CPV = dyn_cast<Constant>(V))
+  if (isa<Constant>(V) && !isa<GlobalValue>(V))
     return true;
   
   CTMap[V] = Ty;
@@ -984,10 +984,9 @@
 
     unsigned OtherIdx = (OldVal == I->getOperand(0)) ? 1 : 0;
     Value *OtherOp    = I->getOperand(OtherIdx);
+    Res->setOperand(!OtherIdx, NewVal);
     Value *NewOther   = ConvertExpressionToType(OtherOp, NewTy, VMC, TD);
-
     Res->setOperand(OtherIdx, NewOther);
-    Res->setOperand(!OtherIdx, NewVal);
     break;
   }
   case Instruction::Shl:


Index: llvm/lib/Transforms/LevelRaise.cpp
diff -u llvm/lib/Transforms/LevelRaise.cpp:1.100 llvm/lib/Transforms/LevelRaise.cpp:1.100.2.1
--- llvm/lib/Transforms/LevelRaise.cpp:1.100	Thu Jul 29 07:17:33 2004
+++ llvm/lib/Transforms/LevelRaise.cpp	Mon Aug  9 10:35:51 2004
@@ -302,7 +302,8 @@
       // Make sure the source doesn't change type
       ConvertedTypes[Src] = Src->getType();
       if (ValueConvertibleToType(CI, Src->getType(), ConvertedTypes, TD)) {
-        PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", *Src, *CI, *BB->getParent());
+        //PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", *Src, *CI,
+        //                *BB->getParent());
 
         DEBUG(std::cerr << "\nCONVERTING EXPR TYPE:\n");
         { // ValueMap must be destroyed before function verified!