diff options
| author | 2015-06-04 17:17:45 +0000 | |
|---|---|---|
| committer | 2015-06-04 17:17:45 +0000 | |
| commit | 6a1c92f1e4a455d802ab0d0ac47504cdd7c12f0f (patch) | |
| tree | 4804c678aecf7be4e77b4fa4adaddebe421095f3 /compiler/optimizing/intrinsics_arm.cc | |
| parent | 8a9fba9154310ddc8024150ca8cd5a7c4b76b71b (diff) | |
| parent | c345f141f11faad177aa9635a78088d00cf66086 (diff) | |
Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
Diffstat (limited to 'compiler/optimizing/intrinsics_arm.cc')
| -rw-r--r-- | compiler/optimizing/intrinsics_arm.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/optimizing/intrinsics_arm.cc b/compiler/optimizing/intrinsics_arm.cc index 749bedf99e..5436ec2dd9 100644 --- a/compiler/optimizing/intrinsics_arm.cc +++ b/compiler/optimizing/intrinsics_arm.cc @@ -101,8 +101,7 @@ class IntrinsicSlowPathARM : public SlowPathCodeARM { MoveArguments(invoke_, codegen); if (invoke_->IsInvokeStaticOrDirect()) { - codegen->GenerateStaticOrDirectCall(invoke_->AsInvokeStaticOrDirect(), - Location::RegisterLocation(kArtMethodRegister)); + codegen->GenerateStaticOrDirectCall(invoke_->AsInvokeStaticOrDirect(), kArtMethodRegister); RecordPcInfo(codegen, invoke_, invoke_->GetDexPc()); } else { UNIMPLEMENTED(FATAL) << "Non-direct intrinsic slow-path not yet implemented"; |