Changes in directory llvm/lib/Transforms/Scalar:
CorrelatedExprs.cpp updated: 1.54 -> 1.55 --- Log message: For PR1205: http://llvm.org/PR1205 : Adjust to changes in ConstantRange interface. --- Diffs of the changes: (+15 -9) CorrelatedExprs.cpp | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) Index: llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp diff -u llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.54 llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.55 --- llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp:1.54 Wed Feb 28 13:57:34 2007 +++ llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp Wed Feb 28 16:03:51 2007 @@ -113,7 +113,8 @@ Value *Replacement; public: ValueInfo(const Type *Ty) - : Bounds(Ty->isInteger() ? Ty : Type::Int32Ty), Replacement(0) {} + : Bounds(Ty->isInteger() ? cast<IntegerType>(Ty)->getBitWidth() : 32), + Replacement(0) {} // getBounds() - Return the constant bounds of the value... const ConstantRange &getBounds() const { return Bounds; } @@ -1153,9 +1154,10 @@ // if (ConstantInt *C = dyn_cast<ConstantInt>(Op1)) { // Check to see if we already know the result of this comparison... - ConstantRange R = ConstantRange(predicate, C->getValue()); + ICmpInst::Predicate ipred = ICmpInst::Predicate(predicate); + ConstantRange R = ICmpInst::makeConstantRange(ipred, C->getValue()); ConstantRange Int = R.intersectWith(Op0VI->getBounds(), - ICmpInst::isSignedPredicate(ICmpInst::Predicate(predicate))); + ICmpInst::isSignedPredicate(ipred)); // If the intersection of the two ranges is empty, then the condition // could never be true! @@ -1199,10 +1201,12 @@ // if (ConstantInt *C = dyn_cast<ConstantInt>(Val)) if (Op >= ICmpInst::FIRST_ICMP_PREDICATE && - Op <= ICmpInst::LAST_ICMP_PREDICATE) - if (ConstantRange(Op, C->getValue()).intersectWith(VI.getBounds(), - ICmpInst::isSignedPredicate(ICmpInst::Predicate(Op))).isEmptySet()) + Op <= ICmpInst::LAST_ICMP_PREDICATE) { + ICmpInst::Predicate ipred = ICmpInst::Predicate(Op); + if (ICmpInst::makeConstantRange(ipred, C->getValue()).intersectWith( + VI.getBounds(), ICmpInst::isSignedPredicate(ipred)).isEmptySet()) return true; + } switch (Rel) { default: assert(0 && "Unknown Relationship code!"); @@ -1257,10 +1261,12 @@ // if (ConstantInt *C = dyn_cast<ConstantInt>(Val)) if (Op >= ICmpInst::FIRST_ICMP_PREDICATE && - Op <= ICmpInst::LAST_ICMP_PREDICATE) + Op <= ICmpInst::LAST_ICMP_PREDICATE) { + ICmpInst::Predicate ipred = ICmpInst::Predicate(Op); VI.getBounds() = - ConstantRange(Op, C->getValue()).intersectWith(VI.getBounds(), - ICmpInst::isSignedPredicate(ICmpInst::Predicate(Op))); + ICmpInst::makeConstantRange(ipred, C->getValue()).intersectWith( + VI.getBounds(), ICmpInst::isSignedPredicate(ipred)); + } switch (Rel) { default: assert(0 && "Unknown prior value!"); _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
