diff options
Diffstat (limited to 'compiler/optimizing/gvn.cc')
| -rw-r--r-- | compiler/optimizing/gvn.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/optimizing/gvn.cc b/compiler/optimizing/gvn.cc index a6ca057cfc..cccb381bc6 100644 --- a/compiler/optimizing/gvn.cc +++ b/compiler/optimizing/gvn.cc @@ -498,10 +498,12 @@ void GlobalValueNumberer::VisitBasicBlock(HBasicBlock* block) { // Deoptimize is a special case since even though we don't want to move it we can still remove // it for GVN. if (current->CanBeMoved() || current->IsBoundType() || current->IsDeoptimize()) { - if (current->IsBinaryOperation() && current->AsBinaryOperation()->IsCommutative()) { + // TODO: Remove "OrNull". + if (current->IsBinaryOperation() && current->AsBinaryOperationOrNull()->IsCommutative()) { // For commutative ops, (x op y) will be treated the same as (y op x) // after fixed ordering. - current->AsBinaryOperation()->OrderInputs(); + // TODO: Remove "OrNull". + current->AsBinaryOperationOrNull()->OrderInputs(); } HInstruction* existing = set->Lookup(current); if (existing != nullptr) { |