From 94d6df471a406a03bb1afba8ca3ae9c0fbf366b5 Mon Sep 17 00:00:00 2001 From: jeffhao Date: Mon, 26 Nov 2012 16:02:12 -0800 Subject: Fixes to make all run-tests except 051-thread work. - Moved exception delivery into common method DeliverException - Renamed old DeliverException to QuickDeliverException since it is only used by quick - Fixed null checks for arrays returned by GetReference - Standardized ArrayStoreException error message - Added additional sleeps to ensure threads stay alive long enough in 051-thread, and that is complete for 084-class-init Change-Id: I9ca306896a4bd10f453150fcf3965d9750fa0cbd --- src/compiler_llvm/runtime_support_llvm.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/compiler_llvm') diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc index 371b32a4da..f01ca9a0a9 100644 --- a/src/compiler_llvm/runtime_support_llvm.cc +++ b/src/compiler_llvm/runtime_support_llvm.cc @@ -156,11 +156,7 @@ void art_throw_stack_overflow_from_code() void art_throw_exception_from_code(Object* exception) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { Thread* thread = art_get_current_thread_from_code(); - if (exception == NULL) { - thread->ThrowNewException("Ljava/lang/NullPointerException;", "throw with null exception"); - } else { - thread->SetException(static_cast(exception)); - } + self->DeliverException(static_cast(exception)); } void* art_get_and_clear_exception(Thread* self) -- cgit v1.2.3-59-g8ed1b