From b027fa001f16660a231a54ecea6a79f5c7855d7c Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Mon, 31 Dec 2007 18:35:50 +0000 Subject: [PATCH] Fix PR1833 - eh.exception and eh.selector return two values, which means doing extra legalization work. It would be easier to get this kind of thing right if there was some documentation... git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45472 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SelectionDAG/LegalizeDAG.cpp | 34 ++++++++++++++---- .../Generic/2007-12-31-UnusedSelector.ll | 36 +++++++++++++++++++ 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 test/CodeGen/Generic/2007-12-31-UnusedSelector.ll diff --git a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp index e1540ea1d2e..688e4f9fea0 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp @@ -858,7 +858,7 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { default: assert(0 && "This action is not supported yet!"); case TargetLowering::Expand: { unsigned Reg = TLI.getExceptionAddressRegister(); - Result = DAG.getCopyFromReg(Tmp1, Reg, VT).getValue(Op.ResNo); + Result = DAG.getCopyFromReg(Tmp1, Reg, VT); } break; case TargetLowering::Custom: @@ -868,12 +868,23 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { case TargetLowering::Legal: { SDOperand Ops[] = { DAG.getConstant(0, VT), Tmp1 }; Result = DAG.getNode(ISD::MERGE_VALUES, DAG.getVTList(VT, MVT::Other), - Ops, 2).getValue(Op.ResNo); + Ops, 2); break; } } } - break; + if (Result.Val->getNumValues() == 1) break; + + assert(Result.Val->getNumValues() == 2 && + "Cannot return more than two values!"); + + // Since we produced two values, make sure to remember that we + // legalized both of them. + Tmp1 = LegalizeOp(Result); + Tmp2 = LegalizeOp(Result.getValue(1)); + AddLegalizedOperand(Op.getValue(0), Tmp1); + AddLegalizedOperand(Op.getValue(1), Tmp2); + return Op.ResNo ? Tmp2 : Tmp1; case ISD::EHSELECTION: { Tmp1 = LegalizeOp(Node->getOperand(0)); Tmp2 = LegalizeOp(Node->getOperand(1)); @@ -882,7 +893,7 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { default: assert(0 && "This action is not supported yet!"); case TargetLowering::Expand: { unsigned Reg = TLI.getExceptionSelectorRegister(); - Result = DAG.getCopyFromReg(Tmp2, Reg, VT).getValue(Op.ResNo); + Result = DAG.getCopyFromReg(Tmp2, Reg, VT); } break; case TargetLowering::Custom: @@ -892,12 +903,23 @@ SDOperand SelectionDAGLegalize::LegalizeOp(SDOperand Op) { case TargetLowering::Legal: { SDOperand Ops[] = { DAG.getConstant(0, VT), Tmp2 }; Result = DAG.getNode(ISD::MERGE_VALUES, DAG.getVTList(VT, MVT::Other), - Ops, 2).getValue(Op.ResNo); + Ops, 2); break; } } } - break; + if (Result.Val->getNumValues() == 1) break; + + assert(Result.Val->getNumValues() == 2 && + "Cannot return more than two values!"); + + // Since we produced two values, make sure to remember that we + // legalized both of them. + Tmp1 = LegalizeOp(Result); + Tmp2 = LegalizeOp(Result.getValue(1)); + AddLegalizedOperand(Op.getValue(0), Tmp1); + AddLegalizedOperand(Op.getValue(1), Tmp2); + return Op.ResNo ? Tmp2 : Tmp1; case ISD::EH_RETURN: { MVT::ValueType VT = Node->getValueType(0); // The only "good" option for this node is to custom lower it. diff --git a/test/CodeGen/Generic/2007-12-31-UnusedSelector.ll b/test/CodeGen/Generic/2007-12-31-UnusedSelector.ll new file mode 100644 index 00000000000..41fdb71ddf4 --- /dev/null +++ b/test/CodeGen/Generic/2007-12-31-UnusedSelector.ll @@ -0,0 +1,36 @@ +; RUN: llvm-as < %s | llc -enable-eh +; PR1833 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32" +target triple = "i686-pc-linux-gnu" + %struct.__class_type_info_pseudo = type { %struct.__type_info_pseudo } + %struct.__type_info_pseudo = type { i8*, i8* } +@_ZTI2e1 = external constant %struct.__class_type_info_pseudo ; <%struct.__class_type_info_pseudo*> [#uses=1] + +define void @_Z7ex_testv() { +entry: + invoke void @__cxa_throw( i8* null, i8* bitcast (%struct.__class_type_info_pseudo* @_ZTI2e1 to i8*), void (i8*)* null ) noreturn + to label %UnifiedUnreachableBlock unwind label %lpad + +bb14: ; preds = %lpad + unreachable + +lpad: ; preds = %entry + invoke void @__cxa_end_catch( ) + to label %bb14 unwind label %lpad17 + +lpad17: ; preds = %lpad + %eh_select20 = tail call i32 (i8*, i8*, ...)* @llvm.eh.selector.i32( i8* null, i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*), i8* null ) ; [#uses=0] + unreachable + +UnifiedUnreachableBlock: ; preds = %entry + unreachable +} + +declare void @__cxa_throw(i8*, i8*, void (i8*)*) noreturn + +declare i32 @llvm.eh.selector.i32(i8*, i8*, ...) + +declare void @__cxa_end_catch() + +declare i32 @__gxx_personality_v0(...) -- 2.34.1