From 72be14ed06b76cd0e83392145cec9025ff43d174 Mon Sep 17 00:00:00 2001 From: Mythri Alle Date: Mon, 1 Nov 2021 11:48:06 +0000 Subject: Revert "Add support for calling entry / exit hooks directly from JIT code" This reverts commit 2d4feeb67912d64b9e980e6687794826a5c22f9d. Reason for revert: This breaks no-image tests. Example failure: https://android-build.googleplex.com/builds/submitted/7871904/art-no-image/latest/view/logs/build_error.log Change-Id: I0f97c672c2d48f125931171ee1041a7c1cf20127 --- runtime/quick_exception_handler.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'runtime/quick_exception_handler.cc') diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index ac5065b2a6..5f497af46a 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -599,10 +599,7 @@ void QuickExceptionHandler::DeoptimizeSingleFrame(DeoptimizationKind kind) { << GetDeoptimizationKindName(kind); DumpFramesWithType(self_, /* details= */ true); } - // When deoptimizing for debug support the optimized code is still valid and - // can be reused when debugging support (like breakpoints) are no longer - // needed fot this method. - if (Runtime::Current()->UseJitCompilation() && (kind != DeoptimizationKind::kDebugging)) { + if (Runtime::Current()->UseJitCompilation()) { Runtime::Current()->GetJit()->GetCodeCache()->InvalidateCompiledCodeFor( deopt_method, visitor.GetSingleFrameDeoptQuickMethodHeader()); } else { -- cgit v1.2.3-59-g8ed1b