Remove fix stub hack.

Change-Id: I6c870f40b3283826b0bd1149a08a4577d6e89e2d

1 files changed, 0 insertions, 17 deletions

diff --git a/src/compiler_llvm/stub_compiler.cc b/src/compiler_llvm/stub_compiler.cc
index af05e5246f..75395324a7 100644
--- a/src/compiler_llvm/stub_compiler.cc
+++ b/src/compiler_llvm/stub_compiler.cc
@@ -141,8 +141,6 @@ CompiledInvokeStub* StubCompiler::CreateInvokeStub(bool is_static,
   }
 
   // Invoke managed method now!
-  // TODO: If we solve the trampoline related problems, we can just get the code address and call.
-#if 0
   llvm::Value* code_field_offset_value =
     irb_.getPtrEquivInt(Method::GetCodeOffset().Int32Value());
 
@@ -151,21 +149,6 @@ CompiledInvokeStub* StubCompiler::CreateInvokeStub(bool is_static,
                        accurate_func_type->getPointerTo()->getPointerTo());
 
   llvm::Value* code_addr = irb_.CreateLoad(code_field_addr, kTBAAJRuntime);
-#else
-  llvm::Value* result = irb_.CreateCall(irb_.GetRuntime(FixStub), method_object_addr);
-  llvm::Value* code_addr = irb_.CreatePointerCast(result, accurate_func_type->getPointerTo());
-
-  // Exception unwind.
-  llvm::Value* exception_pending = irb_.Runtime().EmitIsExceptionPending();
-  llvm::BasicBlock* block_unwind = llvm::BasicBlock::Create(*context_, "exception_unwind", func);
-  llvm::BasicBlock* block_cont = llvm::BasicBlock::Create(*context_, "cont", func);
-  irb_.CreateCondBr(exception_pending, block_unwind, block_cont);
-  irb_.SetInsertPoint(block_unwind);
-  // Restore thread register
-  irb_.Runtime().EmitSetCurrentThread(old_thread_register);
-  irb_.CreateRetVoid();
-  irb_.SetInsertPoint(block_cont);
-#endif
 
   llvm::Value* retval = irb_.CreateCall(code_addr, args);