Instead of hacking in custom support for Invoke/Unwind, use the LowerInvoke pass

llvm-svn: 8871

2 files changed, 14 insertions, 31 deletions

diff --git a/llvm/lib/Target/X86/InstSelectSimple.cpp b/llvm/lib/Target/X86/InstSelectSimple.cpp
index 85708ff2fd4..cc57b0ed4e5 100644
--- a/llvm/lib/Target/X86/InstSelectSimple.cpp
+++ b/llvm/lib/Target/X86/InstSelectSimple.cpp
@@ -131,8 +131,6 @@ namespace {
     void doCall(const ValueRecord &Ret, MachineInstr *CallMI,
 		const std::vector<ValueRecord> &Args);
     void visitCallInst(CallInst &I);
-    void visitInvokeInst(InvokeInst &II);
-    void visitUnwindInst(UnwindInst &UI);
     void visitIntrinsicCall(LLVMIntrinsic::ID ID, CallInst &I);
 
     // Arithmetic operators
@@ -997,35 +995,6 @@ void ISel::visitCallInst(CallInst &CI) {
 }	 
 
 
-// visitInvokeInst - For now, we don't support the llvm.unwind intrinsic, so
-// invoke's are just calls with an unconditional branch after them!
-void ISel::visitInvokeInst(InvokeInst &II) {
-  MachineInstr *TheCall;
-  if (Function *F = II.getCalledFunction()) {
-    // Emit a CALL instruction with PC-relative displacement.
-    TheCall = BuildMI(X86::CALLpcrel32, 1).addGlobalAddress(F, true);
-  } else {  // Emit an indirect call...
-    unsigned Reg = getReg(II.getCalledValue());
-    TheCall = BuildMI(X86::CALLr32, 1).addReg(Reg);
-  }
-
-  std::vector<ValueRecord> Args;
-  for (unsigned i = 3, e = II.getNumOperands(); i != e; ++i)
-    Args.push_back(ValueRecord(II.getOperand(i)));
-
-  unsigned DestReg = II.getType() != Type::VoidTy ? getReg(II) : 0;
-  doCall(ValueRecord(DestReg, II.getType()), TheCall, Args);
-
-  // If the normal destination is not the next basic block, emit a 'jmp'.
-  if (II.getNormalDest() != getBlockAfter(II.getParent()))
-    BuildMI(BB, X86::JMP, 1).addPCDisp(II.getNormalDest());
-}
-
-void ISel::visitUnwindInst(UnwindInst &UI) {
-  // unwind is not supported yet!  Just abort when the unwind inst is executed!
-  BuildMI(BB, X86::CALLpcrel32, 1).addExternalSymbol("abort", true); 
-}
-
 void ISel::visitIntrinsicCall(LLVMIntrinsic::ID ID, CallInst &CI) {
   unsigned TmpReg1, TmpReg2;
   switch (ID) {
diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp
index d511de67212..dcc9beaf9d0 100644
--- a/llvm/lib/Target/X86/X86TargetMachine.cpp
+++ b/llvm/lib/Target/X86/X86TargetMachine.cpp
@@ -50,6 +50,13 @@ bool X86TargetMachine::addPassesToEmitAssembly(PassManager &PM,
   // FIXME: Implement the switch instruction in the instruction selector!
   PM.add(createLowerSwitchPass());
 
+  // FIXME: Implement the invoke/unwind instructions!
+  PM.add(createLowerInvokePass());
+
+  // FIXME: The code generator does not properly handle functions with
+  // unreachable basic blocks.
+  PM.add(createCFGSimplificationPass());
+
   if (NoPatternISel)
     PM.add(createX86SimpleInstructionSelector(*this));
   else
@@ -94,6 +101,13 @@ bool X86TargetMachine::addPassesToJITCompile(FunctionPassManager &PM) {
   // FIXME: Implement the switch instruction in the instruction selector!
   PM.add(createLowerSwitchPass());
 
+  // FIXME: Implement the invoke/unwind instructions!
+  PM.add(createLowerInvokePass());
+
+  // FIXME: The code generator does not properly handle functions with
+  // unreachable basic blocks.
+  PM.add(createCFGSimplificationPass());
+
   if (NoPatternISel)
     PM.add(createX86SimpleInstructionSelector(*this));
   else