From a1f5b901a58c40d57c8d68d9baf81447be95f965 Mon Sep 17 00:00:00 2001 From: Jakob Stoklund Olesen Date: Thu, 4 Jul 2013 00:26:30 +0000 Subject: Revert r185595-185596 which broke buildbots. Revert "Simplify landing pad lowering." Revert "Remove the EXCEPTIONADDR, EHSELECTION, and LSDAADDR ISD opcodes." llvm-svn: 185600 --- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp') diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 3d490fac6b2..587ea83721a 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -829,13 +829,12 @@ void SelectionDAGISel::PrepareEHLandingPad() { // Mark exception register as live in. const TargetLowering *TLI = getTargetLowering(); - const TargetRegisterClass *PtrRC = TLI->getRegClassFor(TLI->getPointerTy()); - if (unsigned Reg = TLI->getExceptionPointerRegister()) - FuncInfo->ExceptionPointerVirtReg = MBB->addLiveIn(Reg, PtrRC); + unsigned Reg = TLI->getExceptionPointerRegister(); + if (Reg) MBB->addLiveIn(Reg); // Mark exception selector register as live in. - if (unsigned Reg = TLI->getExceptionSelectorRegister()) - FuncInfo->ExceptionSelectorVirtReg = MBB->addLiveIn(Reg, PtrRC); + Reg = TLI->getExceptionSelectorRegister(); + if (Reg) MBB->addLiveIn(Reg); } /// isFoldedOrDeadInstruction - Return true if the specified instruction is @@ -973,8 +972,6 @@ void SelectionDAGISel::SelectAllBasicBlocks(const Function &Fn) { FuncInfo->InsertPt = FuncInfo->MBB->getFirstNonPHI(); // Setup an EH landing-pad block. - FuncInfo->ExceptionPointerVirtReg = 0; - FuncInfo->ExceptionSelectorVirtReg = 0; if (FuncInfo->MBB->isLandingPad()) PrepareEHLandingPad(); -- cgit v1.2.3