diff options
| author | David Brazdil <dbrazdil@google.com> | 2015-09-14 21:26:33 +0000 |
|---|---|---|
| committer | David Brazdil <dbrazdil@google.com> | 2015-09-14 21:26:33 +0000 |
| commit | 659562aaf133c41b8d90ec9216c07646f0f14362 (patch) | |
| tree | be1beae390262bf2f5a17bfa44de93081a849d07 /runtime/quick_exception_handler.h | |
| parent | b022fa1300e6d78639b3b910af0cf85c43df44bb (diff) | |
| download | art-659562aaf133c41b8d90ec9216c07646f0f14362.tar.gz art-659562aaf133c41b8d90ec9216c07646f0f14362.tar.bz2 art-659562aaf133c41b8d90ec9216c07646f0f14362.zip | |
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
Diffstat (limited to 'runtime/quick_exception_handler.h')
| -rw-r--r-- | runtime/quick_exception_handler.h | 5 |
1 files changed, 1 insertions, 4 deletions
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_); |