svn commit: r354724 - head/contrib/llvm/lib/Transforms/InstCombine

[Dimitry Andric]

Author: dim
Date: Fri Nov 15 06:56:25 2019
New Revision: 354724
URL: https://svnweb.freebsd.org/changeset/base/354724

Log:
  Merge commit 5bbb604bb from llvm git (by Craig Topper):
  
    [InstCombine] Disable some portions of foldGEPICmp for GEPs that
    return a vector of pointers. Fix other portions.
  
    llvm-svn: 370114
  
  This should fix instances of 'Assertion failed: (isa<X>(Val) &&
  "cast<Ty>() argument of incompatible type!"), function cast, file
  /usr/src/contrib/llvm/include/llvm/Support/Casting.h, line 255', when
  building openjdk8 for aarch64 and armv7.
  
  Reported by:	jbeich
  PR:		236566
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp

Modified: head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp
==============================================================================
--- head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp	Fri Nov 15 04:33:07 2019	(r354723)
+++ head/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp	Fri Nov 15 06:56:25 2019	(r354724)
@@ -832,6 +832,10 @@ getAsConstantIndexedAddress(Value *V, const DataLayout
 static Instruction *transformToIndexedCompare(GEPOperator *GEPLHS, Value *RHS,
                                               ICmpInst::Predicate Cond,
                                               const DataLayout &DL) {
+  // FIXME: Support vector of pointers.
+  if (GEPLHS->getType()->isVectorTy())
+    return nullptr;
+
   if (!GEPLHS->hasAllConstantIndices())
     return nullptr;
 
@@ -882,7 +886,9 @@ Instruction *InstCombiner::foldGEPICmp(GEPOperator *GE
     RHS = RHS->stripPointerCasts();
 
   Value *PtrBase = GEPLHS->getOperand(0);
-  if (PtrBase == RHS && GEPLHS->isInBounds()) {
+  // FIXME: Support vector pointer GEPs.
+  if (PtrBase == RHS && GEPLHS->isInBounds() &&
+      !GEPLHS->getType()->isVectorTy()) {
     // ((gep Ptr, OFFSET) cmp Ptr)   ---> (OFFSET cmp 0).
     // This transformation (ignoring the base and scales) is valid because we
     // know pointers can't overflow since the gep is inbounds.  See if we can
@@ -916,11 +922,13 @@ Instruction *InstCombiner::foldGEPICmp(GEPOperator *GE
       // If we're comparing GEPs with two base pointers that only differ in type
       // and both GEPs have only constant indices or just one use, then fold
       // the compare with the adjusted indices.
+      // FIXME: Support vector of pointers.
       if (GEPLHS->isInBounds() && GEPRHS->isInBounds() &&
           (GEPLHS->hasAllConstantIndices() || GEPLHS->hasOneUse()) &&
           (GEPRHS->hasAllConstantIndices() || GEPRHS->hasOneUse()) &&
           PtrBase->stripPointerCasts() ==
-              GEPRHS->getOperand(0)->stripPointerCasts()) {
+              GEPRHS->getOperand(0)->stripPointerCasts() &&
+          !GEPLHS->getType()->isVectorTy()) {
         Value *LOffset = EmitGEPOffset(GEPLHS);
         Value *ROffset = EmitGEPOffset(GEPRHS);
 
@@ -964,15 +972,20 @@ Instruction *InstCombiner::foldGEPICmp(GEPOperator *GE
       unsigned DiffOperand = 0;     // The operand that differs.
       for (unsigned i = 1, e = GEPRHS->getNumOperands(); i != e; ++i)
         if (GEPLHS->getOperand(i) != GEPRHS->getOperand(i)) {
-          if (GEPLHS->getOperand(i)->getType()->getPrimitiveSizeInBits() !=
-                   GEPRHS->getOperand(i)->getType()->getPrimitiveSizeInBits()) {
+          Type *LHSType = GEPLHS->getOperand(i)->getType();
+          Type *RHSType = GEPRHS->getOperand(i)->getType();
+          // FIXME: Better support for vector of pointers.
+          if (LHSType->getPrimitiveSizeInBits() !=
+                   RHSType->getPrimitiveSizeInBits() ||
+              (GEPLHS->getType()->isVectorTy() &&
+               (!LHSType->isVectorTy() || !RHSType->isVectorTy()))) {
             // Irreconcilable differences.
             NumDifferences = 2;
             break;
-          } else {
-            if (NumDifferences++) break;
-            DiffOperand = i;
           }
+
+          if (NumDifferences++) break;
+          DiffOperand = i;
         }
 
       if (NumDifferences == 0)   // SAME GEP?