commit dd2cf0c7a5dc7f2c89b8ac217f16b7529461e509
author Calin Juravle <calin@google.com> Fri Apr 17 10:03:22 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 17 10:03:22 2015 +0000
tree eccb77f011b88a3df1f3a4789d4192d509a7c6a9
parent f8bdd9f3a002970e4b8fdcf6fe6730116f1626c3
parent 3192540155d51a42b340de7afebe83a5eaf23b03

Merge "Cleanup unnecessary test conditions in ssa builder."

compiler/optimizing/ssa_builder.cc

diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc
index 5c3d9bf..7a252af 100644
--- a/compiler/optimizing/ssa_builder.cc
+++ b/compiler/optimizing/ssa_builder.cc
@@ -186,11 +186,9 @@
       HInstruction* right = equality_instr->InputAt(1);
       HInstruction* null_instr = nullptr;
 
-      if ((left->GetType() == Primitive::kPrimNot)
-          && (right->IsNullConstant() || right->IsIntConstant())) {
+      if ((left->GetType() == Primitive::kPrimNot) && right->IsIntConstant()) {
         null_instr = right;
-      } else if ((right->GetType() == Primitive::kPrimNot)
-              && (left->IsNullConstant() || left->IsIntConstant())) {
+      } else if ((right->GetType() == Primitive::kPrimNot) && left->IsIntConstant()) {
         null_instr = left;
       } else {
         continue;