commit 5e5a804e7be57876df789c88dc0503879f969f39
author TDYa127 <tdy@google.com> Sun Apr 29 01:30:27 2012 -0700
committer Shih-wei Liao <sliao@google.com> Thu May 03 17:38:41 2012 -0700
tree 08e0973ba2d442605a9ef6f27ca0088005f1f015
parent 9948913c01c761493472ccb60ab19be336ac4af4

Remove unnecessary exception check.

Change-Id: Iba16ed9439253dfe635cf216a77a567c8ed32e1d

src/compiler_llvm/jni_compiler.cc

diff --git a/src/compiler_llvm/jni_compiler.cc b/src/compiler_llvm/jni_compiler.cc
index 5a8cc46..801a692 100644
--- a/src/compiler_llvm/jni_compiler.cc
+++ b/src/compiler_llvm/jni_compiler.cc
@@ -197,32 +197,6 @@
     irb_.CreateCall2(irb_.GetRuntime(LockObject),
                      this_object_or_class_object,
                      thread_object_addr);
-
-    // Check exception pending
-    llvm::Value* exception_pending = irb_.CreateCall(irb_.GetRuntime(IsExceptionPending));
-
-    // Create two basic block for branch
-    llvm::BasicBlock* block_cont = llvm::BasicBlock::Create(*context_, "B.cont", func_);
-    llvm::BasicBlock* block_exception_ = llvm::BasicBlock::Create(*context_, "B.exception", func_);
-
-    // Branch by exception_pending
-    irb_.CreateCondBr(exception_pending, block_exception_, block_cont);
-
-
-    // If exception pending
-    irb_.SetInsertPoint(block_exception_);
-    // TODO: Set thread state?
-    // Pop the shadow frame
-    irb_.CreateCall(irb_.GetRuntime(PopShadowFrame));
-    // Unwind
-    if (return_shorty != 'V') {
-      irb_.CreateRet(irb_.getJZero(return_shorty));
-    } else {
-      irb_.CreateRetVoid();
-    }
-
-    // If no exception pending
-    irb_.SetInsertPoint(block_cont);
   }
 
   // saved_local_ref_cookie = env->local_ref_cookie

src/compiler_llvm/method_compiler.cc

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 2d69290..a326b13 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -1535,7 +1535,6 @@
   llvm::Value* thread_object_addr = irb_.CreateCall(irb_.GetRuntime(GetCurrentThread));
 
   irb_.CreateCall2(irb_.GetRuntime(LockObject), object_addr, thread_object_addr);
-  EmitGuard_ExceptionLandingPad(dex_pc);
 
   irb_.CreateBr(GetNextBasicBlock(dex_pc));
 }
@@ -3660,8 +3659,6 @@
   EmitUpdateDexPC(dex_pc);
 
   irb_.CreateCall(runtime_func, thread_object_addr);
-
-  EmitGuard_ExceptionLandingPad(dex_pc);
 }