diff options
| author | 2017-11-30 09:16:37 +0000 | |
|---|---|---|
| committer | 2017-11-30 09:16:37 +0000 | |
| commit | 61bca574a474c26e302bdbc0b23d3c311d218fc6 (patch) | |
| tree | cbcfcee8846c8f9298b64f52e3523d2268e179ca /runtime/entrypoints/entrypoint_utils.cc | |
| parent | da1ea1403227713c81e53e5334106f89d20767ed (diff) | |
| parent | 8f8bd8bfce0f2433bc66ac90a471e5f58cd2e2cc (diff) | |
Merge "Revert "Revert "Revert "JIT JNI stubs.""""
am: 8f8bd8bfce
Change-Id: Ie74a0ae3c130a4bde4fec8f92373d5a9df17663b
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.cc')
| -rw-r--r-- | runtime/entrypoints/entrypoint_utils.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc index f3450da306..2bf4372b1f 100644 --- a/runtime/entrypoints/entrypoint_utils.cc +++ b/runtime/entrypoints/entrypoint_utils.cc @@ -245,7 +245,7 @@ ArtMethod* GetCalleeSaveMethodCaller(ArtMethod** sp, CalleeSaveType type, bool d CallerAndOuterMethod GetCalleeSaveMethodCallerAndOuterMethod(Thread* self, CalleeSaveType type) { CallerAndOuterMethod result; ScopedAssertNoThreadSuspension ants(__FUNCTION__); - ArtMethod** sp = self->GetManagedStack()->GetTopQuickFrameKnownNotTagged(); + ArtMethod** sp = self->GetManagedStack()->GetTopQuickFrame(); auto outer_caller_and_pc = DoGetCalleeSaveMethodOuterCallerAndPc(sp, type); result.outer_method = outer_caller_and_pc.first; uintptr_t caller_pc = outer_caller_and_pc.second; @@ -256,7 +256,7 @@ CallerAndOuterMethod GetCalleeSaveMethodCallerAndOuterMethod(Thread* self, Calle ArtMethod* GetCalleeSaveOuterMethod(Thread* self, CalleeSaveType type) { ScopedAssertNoThreadSuspension ants(__FUNCTION__); - ArtMethod** sp = self->GetManagedStack()->GetTopQuickFrameKnownNotTagged(); + ArtMethod** sp = self->GetManagedStack()->GetTopQuickFrame(); return DoGetCalleeSaveMethodOuterCallerAndPc(sp, type).first; } |