BCE: Narrow instead of unconditionnaly overwrite the range.
bug:21862741
Change-Id: Ic1c2d6fa64255623f87af33a297c459cc9080d3c
diff --git a/compiler/optimizing/bounds_check_elimination.cc b/compiler/optimizing/bounds_check_elimination.cc
index 900dabe..92c7e28 100644
--- a/compiler/optimizing/bounds_check_elimination.cc
+++ b/compiler/optimizing/bounds_check_elimination.cc
@@ -1180,9 +1180,7 @@
}
}
ValueRange* narrowed_range = existing_range->Narrow(range);
- if (narrowed_range != nullptr) {
- GetValueRangeMap(successor)->Overwrite(instruction->GetId(), narrowed_range);
- }
+ GetValueRangeMap(successor)->Overwrite(instruction->GetId(), narrowed_range);
}
// Special case that we may simultaneously narrow two MonotonicValueRange's to
@@ -1730,6 +1728,10 @@
ValueBound upper = ValueBound(new_array, -right_const);
ValueRange* range = new (GetGraph()->GetArena())
ValueRange(GetGraph()->GetArena(), lower, upper);
+ ValueRange* existing_range = LookupValueRange(left, new_array->GetBlock());
+ if (existing_range != nullptr) {
+ range = existing_range->Narrow(range);
+ }
GetValueRangeMap(new_array->GetBlock())->Overwrite(left->GetId(), range);
}
}