From 677d9eff19ef66eceb30324ec876dc8ba3a306e6 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 7 Dec 2021 16:30:08 +0000 Subject: Revert "Simplify and document entrypoint toggling in instrumentation." This reverts commit 76ec6f6562229033b2fecc08c01bef58a9488c92. Reason for revert: Test failure Change-Id: Ibb14e7a2830276b4f0a68b7025f9c394041e52d6 --- runtime/stack.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'runtime/stack.cc') 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. -- cgit v1.2.3-59-g8ed1b