Start using the new function cloning header

[oota-llvm.git] / lib / VMCore / iOperators.cpp

diff --git a/lib/VMCore/iOperators.cpp b/lib/VMCore/iOperators.cpp
index 20e60cf8741bafbaf0659b459e99e3d28ba58b29..5a88986135bd3082389d04dceef10b7e0b6d971d 100644 (file)
--- a/lib/VMCore/iOperators.cpp
+++ b/lib/VMCore/iOperators.cpp
@@ -91,7 +91,7 @@ static inline bool isConstantAllOnes(const Value *V) {
 bool BinaryOperator::isNeg(const Value *V) {
   if (const BinaryOperator *Bop = dyn_cast<BinaryOperator>(V))
     return Bop->getOpcode() == Instruction::Sub &&
-      isa<Constant>(Bop->getOperand(0)) && cast<Constant>(V)->isNullValue();
+      Bop->getOperand(0) == Constant::getNullValue(Bop->getType());
   return false;
 }
 
@@ -133,21 +133,13 @@ const Value *BinaryOperator::getNotArgument(const BinaryOperator *Bop) {
 // order dependant (SetLT f.e.) the opcode is changed.
 //
 bool BinaryOperator::swapOperands() {
-  if (SetCondInst *SCI = dyn_cast<SetCondInst>(this)) {
+  if (isCommutative())
+    ;  // If the instruction is commutative, it is safe to swap the operands
+  else if (SetCondInst *SCI = dyn_cast<SetCondInst>(this))
     iType = SCI->getSwappedCondition();
-    std::swap(Operands[0], Operands[1]);
-    return false;
-  }
+  else
+    return true;   // Can't commute operands
 
-  switch (getOpcode()) {
-    // Instructions that don't need opcode modification
-  case Add: case Mul:
-  case And: case Xor:
-  case Or:
-    // Error on the side of caution
-  default:
-    return true;
-  }
   std::swap(Operands[0], Operands[1]);
   return false;
 }