diff options
| author | 2024-08-01 11:56:37 +0000 | |
|---|---|---|
| committer | 2024-08-05 10:18:42 +0000 | |
| commit | e90e6f26ed47130e5f8ecb19c74e63d4742b54bc (patch) | |
| tree | a78aa243ed88bcfd2fad453b2ebc341f6ccfd589 /runtime/quick_exception_handler.cc | |
| parent | 010414cb2be41b31c8e25e157d350c0f827acab1 (diff) | |
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
Diffstat (limited to 'runtime/quick_exception_handler.cc')
| -rw-r--r-- | runtime/quick_exception_handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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<Context> QuickExceptionHandler::PrepareLongJump(bool smash_caller_saves) { // Prepare and return the context. context_->SetSP(reinterpret_cast<uintptr_t>(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) { |