diff options
| author | 2017-02-03 11:38:35 +0000 | |
|---|---|---|
| committer | 2017-02-03 12:39:16 +0000 | |
| commit | d5cd497f9cd505fb2c085fa09e03b6f3a39d5d34 (patch) | |
| tree | 8584af041ed9788327925c3727e48d98baf87954 /compiler/optimizing | |
| parent | e36c51aee58e61e9fc89851b767379c587f050e3 (diff) | |
ARM: VIXL32: Remove erroneous DCHECK.
This DCHECK was removed from code_generator_arm.cc by d8c052ac but not
from code_generator_arm_vixl.cc at the same time.
Test: export ART_USE_VIXL_ARM_BACKEND=true; m test-art-target
Change-Id: I1132311c37d5a09ee998888b140eb45fac0f7d39
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/code_generator_arm_vixl.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/optimizing/code_generator_arm_vixl.cc b/compiler/optimizing/code_generator_arm_vixl.cc index ffaf18fb4d..2ef145b427 100644 --- a/compiler/optimizing/code_generator_arm_vixl.cc +++ b/compiler/optimizing/code_generator_arm_vixl.cc @@ -7253,8 +7253,7 @@ vixl32::Register CodeGeneratorARMVIXL::GetInvokeStaticOrDirectExtraParameter( // save one load. However, since this is just an intrinsic slow path we prefer this // simple and more robust approach rather that trying to determine if that's the case. SlowPathCode* slow_path = GetCurrentSlowPath(); - DCHECK(slow_path != nullptr); // For intrinsified invokes the call is emitted on the slow path. - if (slow_path->IsCoreRegisterSaved(RegisterFrom(location).GetCode())) { + if (slow_path != nullptr && slow_path->IsCoreRegisterSaved(RegisterFrom(location).GetCode())) { int stack_offset = slow_path->GetStackOffsetOfCoreRegister(RegisterFrom(location).GetCode()); GetAssembler()->LoadFromOffset(kLoadWord, temp, sp, stack_offset); return temp; |