diff options
Diffstat (limited to 'runtime/thread.cc')
| -rw-r--r-- | runtime/thread.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/thread.cc b/runtime/thread.cc index 6e3e9c14ea..d4ac02b3ab 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -592,7 +592,7 @@ static void UnsafeLogFatalForSuspendCount(Thread* self, Thread* thread) NO_THREA } } std::ostringstream ss; - Runtime::Current()->GetThreadList()->DumpLocked(ss); + Runtime::Current()->GetThreadList()->Dump(ss); LOG(FATAL) << ss.str(); } @@ -1602,7 +1602,8 @@ void Thread::ThrowNewExceptionV(const ThrowLocation& throw_location, ThrowNewException(throw_location, exception_class_descriptor, msg.c_str()); } -void Thread::ThrowNewException(const ThrowLocation& throw_location, const char* exception_class_descriptor, +void Thread::ThrowNewException(const ThrowLocation& throw_location, + const char* exception_class_descriptor, const char* msg) { // Callers should either clear or call ThrowNewWrappedException. AssertNoPendingExceptionForNewException(msg); @@ -1638,7 +1639,8 @@ void Thread::ThrowNewWrappedException(const ThrowLocation& throw_location, return; } - if (UNLIKELY(!runtime->GetClassLinker()->EnsureInitialized(exception_class, true, true))) { + if (UNLIKELY(!runtime->GetClassLinker()->EnsureInitialized(soa.Self(), exception_class, true, + true))) { DCHECK(IsExceptionPending()); return; } |