[llvm-commits] [llvm] r125190 - in /llvm/trunk: include/llvm/Constants.h lib/VMCore/Constants.cpp

[Chris Lattner]

Author: lattner
Date: Wed Feb  9 10:43:07 2011
New Revision: 125190

URL: http://llvm.org/viewvc/llvm-project?rev=125190&view=rev
Log:
refactor ConstantExpr interfaces a bit around "exactness".

Modified:
    llvm/trunk/include/llvm/Constants.h
    llvm/trunk/lib/VMCore/Constants.cpp

Modified: llvm/trunk/include/llvm/Constants.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Constants.h?rev=125190&r1=125189&r2=125190&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Constants.h (original)
+++ llvm/trunk/include/llvm/Constants.h Wed Feb  9 10:43:07 2011
@@ -691,8 +691,8 @@
   static Constant *getFSub(Constant *C1, Constant *C2);
   static Constant *getMul(Constant *C1, Constant *C2);
   static Constant *getFMul(Constant *C1, Constant *C2);
-  static Constant *getUDiv(Constant *C1, Constant *C2);
-  static Constant *getSDiv(Constant *C1, Constant *C2);
+  static Constant *getUDiv(Constant *C1, Constant *C2, bool isExact = false);
+  static Constant *getSDiv(Constant *C1, Constant *C2, bool isExact = false);
   static Constant *getFDiv(Constant *C1, Constant *C2);
   static Constant *getURem(Constant *C1, Constant *C2);
   static Constant *getSRem(Constant *C1, Constant *C2);
@@ -701,8 +701,8 @@
   static Constant *getOr(Constant *C1, Constant *C2);
   static Constant *getXor(Constant *C1, Constant *C2);
   static Constant *getShl(Constant *C1, Constant *C2);
-  static Constant *getLShr(Constant *C1, Constant *C2);
-  static Constant *getAShr(Constant *C1, Constant *C2);
+  static Constant *getLShr(Constant *C1, Constant *C2, bool isExact = false);
+  static Constant *getAShr(Constant *C1, Constant *C2, bool isExact = false);
   static Constant *getTrunc   (Constant *C, const Type *Ty);
   static Constant *getSExt    (Constant *C, const Type *Ty);
   static Constant *getZExt    (Constant *C, const Type *Ty);
@@ -726,10 +726,18 @@
   static Constant *getNUWMul(Constant *C1, Constant *C2);
   static Constant *getNSWShl(Constant *C1, Constant *C2);
   static Constant *getNUWShl(Constant *C1, Constant *C2);
-  static Constant *getExactSDiv(Constant *C1, Constant *C2);
-  static Constant *getExactUDiv(Constant *C1, Constant *C2);
-  static Constant *getExactAShr(Constant *C1, Constant *C2);
-  static Constant *getExactLShr(Constant *C1, Constant *C2);
+  static Constant *getExactSDiv(Constant *C1, Constant *C2) {
+    return getSDiv(C1, C2, true);
+  }
+  static Constant *getExactUDiv(Constant *C1, Constant *C2) {
+    return getUDiv(C1, C2, true);
+  }
+  static Constant *getExactAShr(Constant *C1, Constant *C2) {
+    return getAShr(C1, C2, true);
+  }
+  static Constant *getExactLShr(Constant *C1, Constant *C2) {
+    return getLShr(C1, C2, true);
+  }
 
   /// Transparently provide more efficient getOperand methods.
   DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Constant);

Modified: llvm/trunk/lib/VMCore/Constants.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Constants.cpp?rev=125190&r1=125189&r2=125190&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Constants.cpp (original)
+++ llvm/trunk/lib/VMCore/Constants.cpp Wed Feb  9 10:43:07 2011
@@ -691,27 +691,6 @@
                OverflowingBinaryOperator::NoUnsignedWrap);
 }
 
-Constant *ConstantExpr::getExactSDiv(Constant *C1, Constant *C2) {
-  return getTy(C1->getType(), Instruction::SDiv, C1, C2,
-               PossiblyExactOperator::IsExact);
-}
-
-Constant *ConstantExpr::getExactUDiv(Constant *C1, Constant *C2) {
-  return getTy(C1->getType(), Instruction::UDiv, C1, C2,
-               PossiblyExactOperator::IsExact);
-}
-
-Constant *ConstantExpr::getExactAShr(Constant *C1, Constant *C2) {
-  return getTy(C1->getType(), Instruction::AShr, C1, C2,
-               PossiblyExactOperator::IsExact);
-}
-
-Constant *ConstantExpr::getExactLShr(Constant *C1, Constant *C2) {
-  return getTy(C1->getType(), Instruction::LShr, C1, C2,
-               PossiblyExactOperator::IsExact);
-}
-
-
 // Utility function for determining if a ConstantExpr is a CastOp or not. This
 // can't be inline because we don't want to #include Instruction.h into
 // Constant.h
@@ -1890,12 +1869,14 @@
   return get(Instruction::FMul, C1, C2);
 }
 
-Constant *ConstantExpr::getUDiv(Constant *C1, Constant *C2) {
-  return get(Instruction::UDiv, C1, C2);
+Constant *ConstantExpr::getUDiv(Constant *C1, Constant *C2, bool isExact) {
+  return get(Instruction::UDiv, C1, C2,
+             isExact ? PossiblyExactOperator::IsExact : 0);
 }
 
-Constant *ConstantExpr::getSDiv(Constant *C1, Constant *C2) {
-  return get(Instruction::SDiv, C1, C2);
+Constant *ConstantExpr::getSDiv(Constant *C1, Constant *C2, bool isExact) {
+  return get(Instruction::SDiv, C1, C2,
+             isExact ? PossiblyExactOperator::IsExact : 0);
 }
 
 Constant *ConstantExpr::getFDiv(Constant *C1, Constant *C2) {
@@ -1930,12 +1911,14 @@
   return get(Instruction::Shl, C1, C2);
 }
 
-Constant *ConstantExpr::getLShr(Constant *C1, Constant *C2) {
-  return get(Instruction::LShr, C1, C2);
+Constant *ConstantExpr::getLShr(Constant *C1, Constant *C2, bool isExact) {
+  return get(Instruction::LShr, C1, C2,
+             isExact ? PossiblyExactOperator::IsExact : 0);
 }
 
-Constant *ConstantExpr::getAShr(Constant *C1, Constant *C2) {
-  return get(Instruction::AShr, C1, C2);
+Constant *ConstantExpr::getAShr(Constant *C1, Constant *C2, bool isExact) {
+  return get(Instruction::AShr, C1, C2,
+             isExact ? PossiblyExactOperator::IsExact : 0);
 }
 
 // destroyConstant - Remove the constant from the constant table...