diff options
| author | Calin Juravle <calin@google.com> | 2015-04-17 10:03:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-17 10:03:22 +0000 |
| commit | dd2cf0c7a5dc7f2c89b8ac217f16b7529461e509 (patch) | |
| tree | eccb77f011b88a3df1f3a4789d4192d509a7c6a9 /compiler | |
| parent | f8bdd9f3a002970e4b8fdcf6fe6730116f1626c3 (diff) | |
| parent | 3192540155d51a42b340de7afebe83a5eaf23b03 (diff) | |
| download | art-dd2cf0c7a5dc7f2c89b8ac217f16b7529461e509.tar.gz art-dd2cf0c7a5dc7f2c89b8ac217f16b7529461e509.tar.bz2 art-dd2cf0c7a5dc7f2c89b8ac217f16b7529461e509.zip | |
Merge "Cleanup unnecessary test conditions in ssa builder."
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/ssa_builder.cc | 6 |
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; |