!fixup Update to support pattern matching

Author: fhahn

llvm/include/llvm/Analysis/ScalarEvolutionPatternMatch.h

@@ -13,6 +13,7 @@
 #ifndef LLVM_ANALYSIS_SCALAREVOLUTIONPATTERNMATCH_H
 #define LLVM_ANALYSIS_SCALAREVOLUTIONPATTERNMATCH_H
 
+#include "llvm/Analysis/ScalarEvolution.h"
 #include "llvm/Analysis/ScalarEvolutionExpressions.h"
 
 namespace llvm {
@@ -23,6 +24,10 @@ bool match(const SCEV *S, const Pattern &P) {
   return P.match(S);
 }
 
+template <typename Pattern> bool match(SCEVUse U, const Pattern &P) {
+  return match(U.getPointer(), P);
+}
+
 template <typename Predicate> struct cst_pred_ty : public Predicate {
   bool match(const SCEV *S) {
     assert((isa<SCEVCouldNotCompute>(S) || !S->getType()->isVectorTy()) &&

llvm/lib/Analysis/ScalarEvolution.cpp

@@ -10702,7 +10702,8 @@ ScalarEvolution::ExitLimit ScalarEvolution::howFarToZero(SCEVUse V,
   if (!CountDown && !isKnownNonNegative(StepWLG))
     return getCouldNotCompute();
 
-  const SCEV *Distance = CountDown ? Start : getNegativeSCEV(Start);
+  const SCEV *Distance =
+      CountDown ? Start : getNegativeSCEV(Start).getPointer();
   // Handle unitary steps, which cannot wraparound.
   // 1*N = -Start; -1*N = Start (mod 2^BW), so:
   //   N = Distance (as unsigned)
@@ -10745,8 +10746,8 @@ ScalarEvolution::ExitLimit ScalarEvolution::howFarToZero(SCEVUse V,
     if (!loopIsFiniteByAssumption(L) && !isKnownNonZero(StepWLG))
       return getCouldNotCompute();
 
-    SCEVUse Exact =
-        getUDivExpr(Distance, CountDown ? getNegativeSCEV(Step) : Step);
+    SCEVUse Exact = getUDivExpr(
+        Distance, CountDown ? getNegativeSCEV(Step).getPointer() : Step);
     SCEVUse ConstantMax = getCouldNotCompute();
     if (Exact != getCouldNotCompute()) {
       APInt MaxInt = getUnsignedRangeMax(applyLoopGuards(Exact, Guards));