From 77a48ae01bbc5b05ca009cf09e2fcb53e4c8ff23 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 15 Sep 2015 12:34:04 +0000 Subject: Revert "Revert "ART: Register allocation and runtime support for try/catch"" The original CL triggered b/24084144 which has been fixed by Ib72e12a018437c404e82f7ad414554c66a4c6f8c. This reverts commit 659562aaf133c41b8d90ec9216c07646f0f14362. Change-Id: Id8980436172457d0fcb276349c4405f7c4110a55 --- runtime/quick_exception_handler.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'runtime/quick_exception_handler.h') diff --git a/runtime/quick_exception_handler.h b/runtime/quick_exception_handler.h index 4db95a87ec..2e05c7e1e5 100644 --- a/runtime/quick_exception_handler.h +++ b/runtime/quick_exception_handler.h @@ -49,11 +49,14 @@ class QuickExceptionHandler { // Deoptimize the stack to the upcall. For every compiled frame, we create a "copy" // shadow frame that will be executed with the interpreter. void DeoptimizeStack() SHARED_REQUIRES(Locks::mutator_lock_); - // Update the instrumentation stack by removing all methods that will be unwound // by the exception being thrown. void UpdateInstrumentationStack() SHARED_REQUIRES(Locks::mutator_lock_); + // Set up environment before delivering an exception to optimized code. + void SetCatchEnvironmentForOptimizedHandler(StackVisitor* stack_visitor) + SHARED_REQUIRES(Locks::mutator_lock_); + // Long jump either to a catch handler or to the upcall. NO_RETURN void DoLongJump() SHARED_REQUIRES(Locks::mutator_lock_); -- cgit v1.2.3-59-g8ed1b