[llvm-commits] [llvm] r60401 - /llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp

[Bill Wendling]

Author: void
Date: Tue Dec  2 00:18:11 2008
New Revision: 60401

URL: http://llvm.org/viewvc/llvm-project?rev=60401&view=rev
Log:
More styalistic changes. No functionality change.

Modified:
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=60401&r1=60400&r2=60401&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Dec  2 00:18:11 2008
@@ -4438,22 +4438,19 @@
   if (!CI1) return 0;
 
   Value *V1 = 0, *C2 = 0;
-  if (match(Op, m_And(m_Value(V1), m_Value(C2)))) {
-    ConstantInt *CI2 = dyn_cast<ConstantInt>(C2);
-    if (!CI2) return 0;
-
-    APInt Xor = CI1->getValue() ^ CI2->getValue();
-    if (Xor.isAllOnesValue()) {
-      if (V1 == B) {
-        Instruction *NewOp =
-          InsertNewInstBefore(BinaryOperator::CreateAnd(A, CI1), I);
-        return BinaryOperator::CreateOr(NewOp, B);
-      } else if (V1 == A) {
-        Instruction *NewOp =
-          InsertNewInstBefore(BinaryOperator::CreateAnd(B, CI1), I);
-        return BinaryOperator::CreateOr(NewOp, A);
-      }
-    }
+  if (!match(Op, m_And(m_Value(V1), m_ConstantInt(C2)))) return 0;
+
+  APInt Xor = CI1->getValue() ^ CI2->getValue();
+  if (!Xor.isAllOnesValue()) return 0;
+
+  if (V1 == B) {
+    Instruction *NewOp =
+      InsertNewInstBefore(BinaryOperator::CreateAnd(A, CI1), I);
+    return BinaryOperator::CreateOr(NewOp, B);
+  } else if (V1 == A) {
+    Instruction *NewOp =
+      InsertNewInstBefore(BinaryOperator::CreateAnd(B, CI1), I);
+    return BinaryOperator::CreateOr(NewOp, A);
   }
 
   return 0;