commit 056d7756152bb3ced81dd57781be5028428ce2bd
author Nicolas Geoffray <ngeoffray@google.com> Thu Nov 30 09:12:13 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Nov 30 09:12:13 2017 +0000
tree 154ae8968a450a2e02d88207fa09e380fd380553
parent e7441631a11e2e07ce863255a59ee4de29c6a56f

Revert "Revert "Revert "JIT JNI stubs."""

Still seeing occasional failures on 667-jit-jni-stub

Bug: 65574695
Bug: 69843562

This reverts commit e7441631a11e2e07ce863255a59ee4de29c6a56f.

Change-Id: I3db751679ef7bdf31c933208aaffe4fac749a14b

runtime/entrypoints/entrypoint_utils.cc

diff --git a/runtime/entrypoints/entrypoint_utils.cc b/runtime/entrypoints/entrypoint_utils.cc
index f3450da..2bf4372 100644
--- a/runtime/entrypoints/entrypoint_utils.cc
+++ b/runtime/entrypoints/entrypoint_utils.cc
@@ -245,7 +245,7 @@
 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 @@
 
 ArtMethod* GetCalleeSaveOuterMethod(Thread* self, CalleeSaveType type) {
   ScopedAssertNoThreadSuspension ants(__FUNCTION__);
-  ArtMethod** sp = self->GetManagedStack()->GetTopQuickFrameKnownNotTagged();
+  ArtMethod** sp = self->GetManagedStack()->GetTopQuickFrame();
   return DoGetCalleeSaveMethodOuterCallerAndPc(sp, type).first;
 }