From 14691c5e786e8c2c5734f687e4c96217340771be Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 5 Mar 2015 10:40:17 +0000 Subject: Compute the right catch location for the debugger. Also remove tls ThrowLocation, it is not needed anymore. Change-Id: I78fddf09ce968ca475e39c17fa76d699c589c8d9 --- runtime/entrypoints/entrypoint_utils-inl.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'runtime/entrypoints/entrypoint_utils-inl.h') diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index 9d84e4ac48..149c6b43b6 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -613,9 +613,8 @@ inline mirror::String* ResolveStringFromCode(mirror::ArtMethod* referrer, inline void UnlockJniSynchronizedMethod(jobject locked, Thread* self) { // Save any pending exception over monitor exit call. mirror::Throwable* saved_exception = NULL; - ThrowLocation saved_throw_location; if (UNLIKELY(self->IsExceptionPending())) { - saved_exception = self->GetException(&saved_throw_location); + saved_exception = self->GetException(); self->ClearException(); } // Decode locked object and unlock, before popping local references. @@ -624,11 +623,11 @@ inline void UnlockJniSynchronizedMethod(jobject locked, Thread* self) { LOG(FATAL) << "Synchronized JNI code returning with an exception:\n" << saved_exception->Dump() << "\nEncountered second exception during implicit MonitorExit:\n" - << self->GetException(NULL)->Dump(); + << self->GetException()->Dump(); } // Restore pending exception. if (saved_exception != NULL) { - self->SetException(saved_throw_location, saved_exception); + self->SetException(saved_exception); } } -- cgit v1.2.3-59-g8ed1b