svn commit: r348288 - head/contrib/llvm/lib/CodeGen/SelectionDAG

[Dimitry Andric]

Author: dim
Date: Sun May 26 15:44:58 2019
New Revision: 348288
URL: https://svnweb.freebsd.org/changeset/base/348288

Log:
  Pull in r361696 from upstream llvm trunk (by Sanjay Patel):
  
    [SelectionDAG] soften assertion when legalizing narrow vector FP ops
  
    The test based on PR42010:
    https://bugs.llvm.org/show_bug.cgi?id=42010
  
    ...may show an inaccuracy for PPC's target defs, but we should not be
    so aggressive with an assert here. There's no telling what
    out-of-tree targets look like.
  
  This fixes an assertion when building the graphics/mesa-dri port for
  PowerPC64.
  
  Reported by:	Mark Millard <marklmi26-fbsd at yahoo.com>
  PR:		238082
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp

Modified: head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
==============================================================================
--- head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp	Sun May 26 14:15:54 2019	(r348287)
+++ head/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp	Sun May 26 15:44:58 2019	(r348288)
@@ -2523,13 +2523,11 @@ void DAGTypeLegalizer::WidenVectorResult(SDNode *N, un
     // We're going to widen this vector op to a legal type by padding with undef
     // elements. If the wide vector op is eventually going to be expanded to
     // scalar libcalls, then unroll into scalar ops now to avoid unnecessary
-    // libcalls on the undef elements. We are assuming that if the scalar op
-    // requires expanding, then the vector op needs expanding too.
+    // libcalls on the undef elements.
     EVT VT = N->getValueType(0);
-    if (TLI.isOperationExpand(N->getOpcode(), VT.getScalarType())) {
-      EVT WideVecVT = TLI.getTypeToTransformTo(*DAG.getContext(), VT);
-      assert(!TLI.isOperationLegalOrCustom(N->getOpcode(), WideVecVT) &&
-             "Target supports vector op, but scalar requires expansion?");
+    EVT WideVecVT = TLI.getTypeToTransformTo(*DAG.getContext(), VT);
+    if (!TLI.isOperationLegalOrCustom(N->getOpcode(), WideVecVT) &&
+        TLI.isOperationExpand(N->getOpcode(), VT.getScalarType())) {
       Res = DAG.UnrollVectorOp(N, WideVecVT.getVectorNumElements());
       break;
     }