From 15d39adbcaf5e9e779e66ebd252502142c683e18 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Sun, 1 Jul 2012 02:17:08 +0000 Subject: [PATCH] Fix a crash on release builds if gather intrinsics are passed a non-constant value for the last argument. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159501 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86ISelDAGToDAG.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/Target/X86/X86ISelDAGToDAG.cpp b/lib/Target/X86/X86ISelDAGToDAG.cpp index b34f15c34be..4a0271fd86b 100644 --- a/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -1963,7 +1963,8 @@ SDNode *X86DAGToDAGISel::SelectGather(SDNode *Node, unsigned Opc) { SDValue VIdx = Node->getOperand(4); SDValue VMask = Node->getOperand(5); ConstantSDNode *Scale = dyn_cast(Node->getOperand(6)); - assert(Scale && "Scale should be a constant for GATHER operations"); + if (!Scale) + return 0; // Memory Operands: Base, Scale, Index, Disp, Segment SDValue Disp = CurDAG->getTargetConstant(0, MVT::i32); @@ -2031,7 +2032,9 @@ SDNode *X86DAGToDAGISel::Select(SDNode *Node) { case Intrinsic::x86_avx2_gather_q_d: Opc = X86::VPGATHERQDrm; break; case Intrinsic::x86_avx2_gather_q_d_256: Opc = X86::VPGATHERQDYrm; break; } - return SelectGather(Node, Opc); + SDNode *RetVal = SelectGather(Node, Opc); + if (RetVal) + return RetVal; } } break; -- 2.34.1