[llvm-commits] CVS: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp

[Chris Lattner]

Changes in directory llvm/lib/Transforms/Scalar:

CorrelatedExprs.cpp updated: 1.20 -> 1.21

---
Log message:

Remove use of the ConstantHandling interfaces


---
Diffs of the changes:  (+6 -15)

Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.20 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.21
--- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.20	Fri Jan  9 00:02:20 2004
+++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp	Mon Jan 12 13:12:50 2004
@@ -27,10 +27,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/Scalar.h"
+#include "llvm/Constants.h"
 #include "llvm/Pass.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
-#include "llvm/ConstantHandling.h"
+#include "llvm/Type.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Transforms/Utils/Local.h"
@@ -1129,20 +1130,10 @@
   assert(C != 0 && "C is not specified!");
   if (Bound == 0) return false;
 
-  ConstantBool *Val;
-  switch (BO) {
-  default: assert(0 && "Unknown Condition code!");
-  case Instruction::SetEQ: Val = *Bound == *C; break;
-  case Instruction::SetNE: Val = *Bound != *C; break;
-  case Instruction::SetLT: Val = *Bound <  *C; break;
-  case Instruction::SetGT: Val = *Bound >  *C; break;
-  case Instruction::SetLE: Val = *Bound <= *C; break;
-  case Instruction::SetGE: Val = *Bound >= *C; break;
-  }
-
-  // ConstantHandling code may not succeed in the comparison...
-  if (Val == 0) return false;
-  return !Val->getValue();  // Return true if the condition is false...
+  Constant *Val = ConstantExpr::get(BO, Bound, C);
+  if (ConstantBool *CB = dyn_cast<ConstantBool>(Val))
+    return !CB->getValue();  // Return true if the condition is false...
+  return false;
 }
 
 // contradicts - Return true if the relationship specified by the operand