From 659562aaf133c41b8d90ec9216c07646f0f14362 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Mon, 14 Sep 2015 21:26:33 +0000 Subject: Revert "ART: Register allocation and runtime support for try/catch" Breaks libcore test org.apache.harmony.security.tests.java.security.KeyStorePrivateKeyEntryTest#testGetCertificateChain. Need to investigate. This reverts commit b022fa1300e6d78639b3b910af0cf85c43df44bb. Change-Id: Ib24d3a80064d963d273e557a93469c95f37b1f6f --- runtime/quick_exception_handler.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'runtime/quick_exception_handler.h') diff --git a/runtime/quick_exception_handler.h b/runtime/quick_exception_handler.h index 2e05c7e1e5..4db95a87ec 100644 --- a/runtime/quick_exception_handler.h +++ b/runtime/quick_exception_handler.h @@ -49,14 +49,11 @@ 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