diff options
| author | 2012-11-26 16:02:12 -0800 | |
|---|---|---|
| committer | 2012-11-26 16:02:12 -0800 | |
| commit | 94d6df471a406a03bb1afba8ca3ae9c0fbf366b5 (patch) | |
| tree | f89af30dbe4a23dc6f62bb17c3b0a36b778ade33 /src/compiler_llvm | |
| parent | 5bc252873e6e50f8257e33ca158d0e350413fcbf (diff) | |
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 <clinit> is complete for 084-class-init
Change-Id: I9ca306896a4bd10f453150fcf3965d9750fa0cbd
Diffstat (limited to 'src/compiler_llvm')
| -rw-r--r-- | src/compiler_llvm/runtime_support_llvm.cc | 6 |
1 files changed, 1 insertions, 5 deletions
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<Throwable*>(exception)); - } + self->DeliverException(static_cast<Throwable*>(exception)); } void* art_get_and_clear_exception(Thread* self) |