commit 2d7021776f10fe666ecd197713bcf88507851c37
author TDYa127 <tdy@google.com> Sun Apr 01 15:15:13 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sun Apr 01 21:37:16 2012 -0700
tree 8d96fc0ed8c4896cad579f2057dca4159c495b9d
parent 3db5285b363553ea81bd8dd88ec448b66cf33d71

Fix the find_catch_block bug in runtime_support_llvm.

Change-Id: I5de06a0103ab37cf457ba9e02890d299e5c1e350

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 d929d3d..3d2b84a 100644
--- a/src/compiler_llvm/runtime_support_llvm.cc
+++ b/src/compiler_llvm/runtime_support_llvm.cc
@@ -125,9 +125,9 @@
   thread->SetException(static_cast<Throwable*>(exception));
 }
 
-int32_t art_find_catch_block_from_code(Object* exception, int32_t dex_pc) {
-  Class* exception_type = exception->GetClass();
-  Method* current_method = Thread::Current()->GetCurrentMethod();
+int32_t art_find_catch_block_from_code(Method* current_method, int32_t dex_pc) {
+  Thread* thread = Thread::Current();
+  Class* exception_type = thread->GetException()->GetClass();
   MethodHelper mh(current_method);
   const DexFile::CodeItem* code_item = mh.GetCodeItem();
   int iter_index = 0;

src/compiler_llvm/runtime_support_llvm.h

diff --git a/src/compiler_llvm/runtime_support_llvm.h b/src/compiler_llvm/runtime_support_llvm.h
index fb951ba..f0e0a58 100644
--- a/src/compiler_llvm/runtime_support_llvm.h
+++ b/src/compiler_llvm/runtime_support_llvm.h
@@ -46,7 +46,7 @@
 
 void art_throw_exception_from_code(Object* exception);
 
-int32_t art_find_catch_block_from_code(Object* exception, int32_t dex_pc);
+int32_t art_find_catch_block_from_code(Method* current_method, int32_t dex_pc);
 
 
 void art_test_suspend_from_code();