diff options
| author | Calin Juravle <calin@google.com> | 2015-04-21 22:08:51 +0100 |
|---|---|---|
| committer | Calin Juravle <calin@google.com> | 2015-04-22 11:40:25 +0100 |
| commit | 641547a5f18ca2ea54469cceadcfef64f132e5e0 (patch) | |
| tree | 441e325fc9bea377c549101756d9e8dc68f95779 /compiler/optimizing/intrinsics_arm.cc | |
| parent | 296c6cc2e5e90a81bdfc5f5486eae6b64d80e595 (diff) | |
| download | art-641547a5f18ca2ea54469cceadcfef64f132e5e0.zip art-641547a5f18ca2ea54469cceadcfef64f132e5e0.tar.gz art-641547a5f18ca2ea54469cceadcfef64f132e5e0.tar.bz2 | |
[optimizing] Fix a bug in moving the null check to the user.
When taking the decision to move a null check to the user we did not
verify if the next instruction checks the same object.
Change-Id: I2f4533a4bb18aa4b0b6d5e419f37dcccd60354d2
Diffstat (limited to 'compiler/optimizing/intrinsics_arm.cc')
| -rw-r--r-- | compiler/optimizing/intrinsics_arm.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/intrinsics_arm.cc b/compiler/optimizing/intrinsics_arm.cc index 9a6062f..932192e 100644 --- a/compiler/optimizing/intrinsics_arm.cc +++ b/compiler/optimizing/intrinsics_arm.cc @@ -863,7 +863,7 @@ void IntrinsicCodeGeneratorARM::VisitStringCompareTo(HInvoke* invoke) { LocationSummary* locations = invoke->GetLocations(); // Note that the null check must have been done earlier. - DCHECK(!invoke->CanDoImplicitNullCheck()); + DCHECK(!invoke->CanDoImplicitNullCheckOn(invoke->InputAt(0))); Register argument = locations->InAt(1).AsRegister<Register>(); __ cmp(argument, ShifterOperand(0)); |