Cleanup unnecessary test conditions in ssa builder.

Change-Id: Ic36e535aec3f977ebe36bfe20bc54a1033de62c6

1 files changed, 2 insertions, 4 deletions

diff --git a/compiler/optimizing/ssa_builder.cc b/compiler/optimizing/ssa_builder.cc
index 5c3d9bf725..7a252af2ad 100644
--- a/compiler/optimizing/ssa_builder.cc
+++ b/compiler/optimizing/ssa_builder.cc
@@ -186,11 +186,9 @@ void SsaBuilder::FixNullConstantType() {
       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;