From 1e77dc84c49eebcd440ed79f6180dbabf6e81cf8 Mon Sep 17 00:00:00 2001 From: Tim Northover Date: Fri, 29 Aug 2014 15:34:58 +0000 Subject: [PATCH] AArch64: only try to get operand of a known node. A bug in r216725 meant we tried to discover the type of a SETCC before confirming the node actually was a SETCC. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216734 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/AArch64/AArch64ISelLowering.cpp | 10 +++++----- test/CodeGen/AArch64/cond-sel.ll | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/Target/AArch64/AArch64ISelLowering.cpp b/lib/Target/AArch64/AArch64ISelLowering.cpp index 430938e2f43..5ccc4bf9ff4 100644 --- a/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -7994,18 +7994,18 @@ static SDValue performVSelectCombine(SDNode *N, SelectionDAG &DAG) { static SDValue performSelectCombine(SDNode *N, SelectionDAG &DAG) { SDValue N0 = N->getOperand(0); EVT ResVT = N->getValueType(0); - EVT SrcVT = N0.getOperand(0).getValueType(); - int NumMaskElts = ResVT.getSizeInBits() / SrcVT.getSizeInBits(); + + if (N0.getOpcode() != ISD::SETCC || N0.getValueType() != MVT::i1) + return SDValue(); // If NumMaskElts == 0, the comparison is larger than select result. The // largest real NEON comparison is 64-bits per lane, which means the result is // at most 32-bits and an illegal vector. Just bail out for now. + EVT SrcVT = N0.getOperand(0).getValueType(); + int NumMaskElts = ResVT.getSizeInBits() / SrcVT.getSizeInBits(); if (!ResVT.isVector() || NumMaskElts == 0) return SDValue(); - if (N0.getOpcode() != ISD::SETCC || N0.getValueType() != MVT::i1) - return SDValue(); - SrcVT = EVT::getVectorVT(*DAG.getContext(), SrcVT, NumMaskElts); EVT CCVT = SrcVT.changeVectorElementTypeToInteger(); diff --git a/test/CodeGen/AArch64/cond-sel.ll b/test/CodeGen/AArch64/cond-sel.ll index 333f2436133..dfc83aacfcf 100644 --- a/test/CodeGen/AArch64/cond-sel.ll +++ b/test/CodeGen/AArch64/cond-sel.ll @@ -224,3 +224,10 @@ define <1 x i1> @test_wide_comparison(i32 %in) { %res = select i1 %tmp, <1 x i1> , <1 x i1> zeroinitializer ret <1 x i1> %res } + +define i32 @test_select_undef() { +; CHECK-LABEL: test_select_undef: +; CHECK: ret + %res = select i1 undef, i32 0, i32 42 + ret i32 %res +} -- 2.11.0