diff options
| author | 2018-05-08 12:13:53 +0000 | |
|---|---|---|
| committer | 2018-05-08 12:13:53 +0000 | |
| commit | b865d9af3bb5f4777dbe9cbd60cdb2a8fe5f0557 (patch) | |
| tree | 8cad1b90006fa620dec995b71c80ee5f47081990 /compiler/optimizing/instruction_simplifier.cc | |
| parent | 1b19877e78f58ff3f676845380ec1280791d9500 (diff) | |
| parent | e394622583774d7e3c32bea0c7ffc4777ee47e56 (diff) | |
Merge changes I506bc2a8,I7310de97,Ib3fd1110
* changes:
ART: Do not define abstract HIR kinds.
ART: Remove InstructionTypeEquals().
Store HIR type in HInstruction::packed_field_.
Diffstat (limited to 'compiler/optimizing/instruction_simplifier.cc')
| -rw-r--r-- | compiler/optimizing/instruction_simplifier.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/instruction_simplifier.cc b/compiler/optimizing/instruction_simplifier.cc index 0fe16725f3..ca84d421a7 100644 --- a/compiler/optimizing/instruction_simplifier.cc +++ b/compiler/optimizing/instruction_simplifier.cc @@ -2666,10 +2666,10 @@ bool InstructionSimplifierVisitor::TryHandleAssociativeAndCommutativeOperation( HConstant* const2; HBinaryOperation* y; - if (instruction->InstructionTypeEquals(left) && right->IsConstant()) { + if (instruction->GetKind() == left->GetKind() && right->IsConstant()) { const2 = right->AsConstant(); y = left->AsBinaryOperation(); - } else if (left->IsConstant() && instruction->InstructionTypeEquals(right)) { + } else if (left->IsConstant() && instruction->GetKind() == right->GetKind()) { const2 = left->AsConstant(); y = right->AsBinaryOperation(); } else { |