summaryrefslogtreecommitdiff
path: root/runtime/quick_exception_handler.h
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2015-03-09 10:15:14 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-03-09 10:15:14 +0000
commita60bb12ed88a0f11fb6a8444964ea55af2054824 (patch)
tree8eabb49a208c04b219e5a1b037254647498d9d1d /runtime/quick_exception_handler.h
parentf20cc35c8e37a515fc19ca554b56ee78dfa7cc82 (diff)
parent5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b (diff)
am 5c9d8f0d: Merge "Compute the right catch location for the debugger."
* commit '5c9d8f0d2948c2b4fe4258f96e3598ad5b8fa23b': Compute the right catch location for the debugger.
Diffstat (limited to 'runtime/quick_exception_handler.h')
-rw-r--r--runtime/quick_exception_handler.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/quick_exception_handler.h b/runtime/quick_exception_handler.h
index a0e6a79299..08619fa0d4 100644
--- a/runtime/quick_exception_handler.h
+++ b/runtime/quick_exception_handler.h
@@ -44,8 +44,7 @@ class QuickExceptionHandler {
UNREACHABLE();
}
- void FindCatch(const ThrowLocation& throw_location, mirror::Throwable* exception)
- SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ void FindCatch(mirror::Throwable* exception) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
void DeoptimizeStack() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
void UpdateInstrumentationStack() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
NO_RETURN void DoLongJump() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);