commit 725de295024c9e5adf5e316f498c39d48158e19d
author Ian Rogers <irogers@google.com> Tue Nov 27 13:06:28 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 27 13:06:29 2012 -0800
tree 68470f11403def33eef2af5b000ac8b6f5707649
parent ce945c48173a7cc39fe41f04889def830f8b28f4
parent 9e419ca03c674b913135b87bcf2291a12708260b

Merge "Disable another CHECK when gAborting" into dalvik-dev

src/compiler_llvm/runtime_support_llvm.cc

diff --git a/src/compiler_llvm/runtime_support_llvm.cc b/src/compiler_llvm/runtime_support_llvm.cc
index f01ca9a..3cdd532 100644
--- a/src/compiler_llvm/runtime_support_llvm.cc
+++ b/src/compiler_llvm/runtime_support_llvm.cc
@@ -156,7 +156,7 @@
 void art_throw_exception_from_code(Object* exception)
     SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
   Thread* thread = art_get_current_thread_from_code();
-  self->DeliverException(static_cast<Throwable*>(exception));
+  thread->DeliverException(static_cast<Throwable*>(exception));
 }
 
 void* art_get_and_clear_exception(Thread* self)