From e90e6f26ed47130e5f8ecb19c74e63d4742b54bc Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 1 Aug 2024 11:56:37 +0000 Subject: Clean up after exception delivery rewrite. Clean up after https://android-review.googlesource.com/2680017 and fix CFI for `art_quick_do_long_jump`. Test: m test-art-host-gest Test: testrunner.py --host --optimizing Change-Id: Ief6cda2c223c4225dc5b5145452d926674430caa --- runtime/quick_exception_handler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/quick_exception_handler.cc') diff --git a/runtime/quick_exception_handler.cc b/runtime/quick_exception_handler.cc index 8924108f74..beb42a6a05 100644 --- a/runtime/quick_exception_handler.cc +++ b/runtime/quick_exception_handler.cc @@ -806,7 +806,7 @@ void QuickExceptionHandler::DeoptimizePartialFragmentFixup() { } } -Context* QuickExceptionHandler::PrepareLongJump(bool smash_caller_saves) { +std::unique_ptr QuickExceptionHandler::PrepareLongJump(bool smash_caller_saves) { // Prepare and return the context. context_->SetSP(reinterpret_cast(handler_quick_frame_)); CHECK_NE(handler_quick_frame_pc_, 0u); @@ -826,7 +826,7 @@ Context* QuickExceptionHandler::PrepareLongJump(bool smash_caller_saves) { } // Clear the dex_pc list so as not to leak memory. handler_dex_pc_list_.reset(); - return context_.release(); + return std::move(context_); } void QuickExceptionHandler::DumpFramesWithType(Thread* self, bool details) { -- cgit v1.2.3-59-g8ed1b