commit 9a14265c911b2e63bec51a814b8b6fd157745b57
author Jeff Hao <jeffhao@google.com> Thu Jan 17 23:10:19 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 17 23:10:19 2013 +0000
tree 529d7bbcb15a6b2824413aa52ca1440a1d15c21a
parent a1ae861c673ab5160a2a7afee2ada806cb61966b

Revert "Change LLVM exception check to check all thread flags."

This reverts commit a1ae861c673ab5160a2a7afee2ada806cb61966b

Change-Id: Idba8b55bf9df79174cf89a1c332b169eac9c0ff1

src/compiler_llvm/gbc_expander.cc

diff --git a/src/compiler_llvm/gbc_expander.cc b/src/compiler_llvm/gbc_expander.cc
index 42a87a3..c285c0b 100644
--- a/src/compiler_llvm/gbc_expander.cc
+++ b/src/compiler_llvm/gbc_expander.cc
@@ -2660,36 +2660,18 @@
 }
 
 void GBCExpanderPass::EmitGuard_ExceptionLandingPad(uint32_t dex_pc) {
+  llvm::Value* exception_pending = irb_.Runtime().EmitIsExceptionPending();
+
   llvm::BasicBlock* block_cont = CreateBasicBlockWithDexPC(dex_pc, "cont");
-  llvm::BasicBlock* block_flags = CreateBasicBlockWithDexPC(dex_pc, "flags");
-  llvm::BasicBlock* block_suspend = CreateBasicBlockWithDexPC(dex_pc, "suspend");
-
-  llvm::Value* flags =
-      irb_.Runtime().EmitLoadFromThreadOffset(art::Thread::ThreadFlagsOffset().Int32Value(),
-                                              irb_.getInt16Ty(),
-                                              kTBAARuntimeInfo);
-  llvm::Value* flags_set = irb_.CreateICmpNE(flags, irb_.getInt16(0));
-  irb_.CreateCondBr(flags_set, block_flags, block_cont, kUnlikely);
-
-  irb_.SetInsertPoint(block_flags);
-  llvm::Value* exception_pending = irb_.CreateAnd(flags, irb_.getInt16(art::kExceptionPending));
-  llvm::Value* exception_set = irb_.CreateICmpNE(exception_pending, irb_.getInt16(0));
 
   if (llvm::BasicBlock* lpad = GetLandingPadBasicBlock(dex_pc)) {
     landing_pad_phi_mapping_[lpad].push_back(std::make_pair(current_bb_->getUniquePredecessor(),
                                                             irb_.GetInsertBlock()));
-    irb_.CreateCondBr(exception_set, lpad, block_suspend, kLikely);
+    irb_.CreateCondBr(exception_pending, lpad, block_cont, kUnlikely);
   } else {
-    irb_.CreateCondBr(exception_set, GetUnwindBasicBlock(), block_suspend, kLikely);
+    irb_.CreateCondBr(exception_pending, GetUnwindBasicBlock(), block_cont, kUnlikely);
   }
 
-  irb_.SetInsertPoint(block_suspend);
-  if (dex_pc != art::DexFile::kDexNoIndex) {
-    EmitUpdateDexPC(dex_pc);
-  }
-  irb_.Runtime().EmitTestSuspend();
-  irb_.CreateBr(block_cont);
-
   irb_.SetInsertPoint(block_cont);
 }
 

src/compiler_llvm/method_compiler.cc

diff --git a/src/compiler_llvm/method_compiler.cc b/src/compiler_llvm/method_compiler.cc
index 7ab11f5..ccec7e9 100644
--- a/src/compiler_llvm/method_compiler.cc
+++ b/src/compiler_llvm/method_compiler.cc
@@ -3540,34 +3540,16 @@
     return;
   }
 
+  llvm::Value* exception_pending = irb_.Runtime().EmitIsExceptionPending();
+
   llvm::BasicBlock* block_cont = CreateBasicBlockWithDexPC(dex_pc, "cont");
-  llvm::BasicBlock* block_flags = CreateBasicBlockWithDexPC(dex_pc, "flags");
-  llvm::BasicBlock* block_suspend = CreateBasicBlockWithDexPC(dex_pc, "suspend");
-
-  llvm::Value* flags =
-      irb_.Runtime().EmitLoadFromThreadOffset(art::Thread::ThreadFlagsOffset().Int32Value(),
-                                              irb_.getInt16Ty(),
-                                              kTBAARuntimeInfo);
-  llvm::Value* flags_set = irb_.CreateICmpNE(flags, irb_.getInt16(0));
-  irb_.CreateCondBr(flags_set, block_flags, block_cont, kUnlikely);
-
-  irb_.SetInsertPoint(block_flags);
-  llvm::Value* exception_pending = irb_.CreateAnd(flags, irb_.getInt16(art::kExceptionPending));
-  llvm::Value* exception_set = irb_.CreateICmpNE(exception_pending, irb_.getInt16(0));
 
   if (lpad) {
-    irb_.CreateCondBr(exception_set, lpad, block_suspend, kLikely);
+    irb_.CreateCondBr(exception_pending, lpad, block_cont, kUnlikely);
   } else {
-    irb_.CreateCondBr(exception_set, GetUnwindBasicBlock(), block_suspend, kLikely);
+    irb_.CreateCondBr(exception_pending, GetUnwindBasicBlock(), block_cont, kUnlikely);
   }
 
-  irb_.SetInsertPoint(block_suspend);
-  if (dex_pc != art::DexFile::kDexNoIndex) {
-    EmitUpdateDexPC(dex_pc);
-  }
-  irb_.Runtime().EmitTestSuspend();
-  irb_.CreateBr(block_cont);
-
   irb_.SetInsertPoint(block_cont);
 }
 

src/compiler_llvm/runtime_support_builder.cc

diff --git a/src/compiler_llvm/runtime_support_builder.cc b/src/compiler_llvm/runtime_support_builder.cc
index 28ef0d3..9513d4a 100644
--- a/src/compiler_llvm/runtime_support_builder.cc
+++ b/src/compiler_llvm/runtime_support_builder.cc
@@ -147,11 +147,11 @@
 }
 
 llvm::Value* RuntimeSupportBuilder::EmitIsExceptionPending() {
-  Value* flags = EmitLoadFromThreadOffset(Thread::ThreadFlagsOffset().Int32Value(),
-                                          irb_.getInt16Ty(),
-                                          kTBAARuntimeInfo);
+  Value* state_and_flags = EmitLoadFromThreadOffset(Thread::ThreadFlagsOffset().Int32Value(),
+                                                    irb_.getInt16Ty(),
+                                                    kTBAARuntimeInfo);
   // Mask exception pending status and return true if non-zero.
-  Value* exception_pending = irb_.CreateAnd(flags, irb_.getInt16(kExceptionPending));
+  Value* exception_pending = irb_.CreateAnd(state_and_flags, irb_.getInt16(kExceptionPending));
   return irb_.CreateICmpNE(exception_pending, irb_.getInt16(0));
 }