From 5c9b55aa95295a287abd86f1e7fbe98c3f35ffd6 Mon Sep 17 00:00:00 2001 From: Mythri Alle Date: Fri, 24 Jun 2022 13:12:20 +0000 Subject: Revert "Don't use instrumentation stubs for native methods in debuggable" This reverts commit 90f12677f80169dc3ef919c2067349f94b943e7f. Reason for revert: Failures on device https://ci.chromium.org/ui/p/art/builders/ci/angler-armv7-ndebug/3058/overview https://ci.chromium.org/ui/p/art/builders/ci/angler-armv8-ndebug/3049/overview Change-Id: I43f943f9180b8c76db02a2a5c228a209a2f18a82 --- runtime/quick_exception_handler.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'runtime/quick_exception_handler.cc') diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index 40a1c16905..8adc3b3e49 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -399,10 +399,9 @@ class DeoptimizeStackVisitor final : public StackVisitor { return true; } else if (method->IsNative()) { // If we return from JNI with a pending exception and want to deoptimize, we need to skip - // the native method. The top method is a runtime method, the native method comes next. - // We also deoptimize due to method instrumentation reasons from method entry / exit - // callbacks. In these cases native method is at the top of stack. - CHECK((GetFrameDepth() == 1U) || (GetFrameDepth() == 0U)); + // the native method. + // The top method is a runtime method, the native method comes next. + CHECK_EQ(GetFrameDepth(), 1U); callee_method_ = method; return true; } else if (!single_frame_deopt_ && -- cgit v1.2.3-59-g8ed1b