summaryrefslogtreecommitdiff
path: root/runtime/stack.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2021-12-07 16:30:08 +0000
committer Nicolas Geoffray <ngeoffray@google.com> 2021-12-07 21:27:05 +0000
commit677d9eff19ef66eceb30324ec876dc8ba3a306e6 (patch)
tree7803bd9eebdadc02e31c0b7465d2b3f853af7815 /runtime/stack.cc
parenta2470456d180388d6f93edde3778a0512c746f12 (diff)
Revert "Simplify and document entrypoint toggling in instrumentation."
This reverts commit 76ec6f6562229033b2fecc08c01bef58a9488c92. Reason for revert: Test failure Change-Id: Ibb14e7a2830276b4f0a68b7025f9c394041e52d6
Diffstat (limited to 'runtime/stack.cc')
-rw-r--r--runtime/stack.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/stack.cc b/runtime/stack.cc
index 7f1f47f2bc..eb0fe5692d 100644
--- a/runtime/stack.cc
+++ b/runtime/stack.cc
@@ -787,7 +787,8 @@ QuickMethodFrameInfo StackVisitor::GetCurrentQuickFrameInfo() const {
DCHECK(method->IsNative());
if (kIsDebugBuild && !method->IsCriticalNative()) {
ClassLinker* class_linker = runtime->GetClassLinker();
- const void* entry_point = runtime->GetInstrumentation()->GetCodeForInvoke(method);
+ const void* entry_point = runtime->GetInstrumentation()->GetQuickCodeFor(method,
+ kRuntimePointerSize);
CHECK(class_linker->IsQuickGenericJniStub(entry_point) ||
// The current entrypoint (after filtering out trampolines) may have changed
// from GenericJNI to JIT-compiled stub since we have entered this frame.