diff --git a/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h b/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h --- a/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h +++ b/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h @@ -182,9 +182,12 @@ bool isHighCostExpansion(const SCEV *Expr, Loop *L, unsigned Budget, const TargetTransformInfo *TTI, const Instruction *At = nullptr) { + assert(TTI && "This function requires TTI to be provided."); + if (!TTI) // In assert-less builds, avoid crashing + return true; // by always claiming to be high-cost. SmallPtrSet Processed; int BudgetRemaining = Budget * TargetTransformInfo::TCC_Basic; - return isHighCostExpansionHelper(Expr, L, At, BudgetRemaining, TTI, + return isHighCostExpansionHelper(Expr, L, At, BudgetRemaining, *TTI, Processed); } @@ -329,7 +332,7 @@ /// Recursive helper function for isHighCostExpansion. bool isHighCostExpansionHelper(const SCEV *S, Loop *L, const Instruction *At, int &BudgetRemaining, - const TargetTransformInfo *TTI, + const TargetTransformInfo &TTI, SmallPtrSetImpl &Processed); /// Insert the specified binary operator, doing a small amount of work to diff --git a/llvm/lib/Analysis/ScalarEvolutionExpander.cpp b/llvm/lib/Analysis/ScalarEvolutionExpander.cpp --- a/llvm/lib/Analysis/ScalarEvolutionExpander.cpp +++ b/llvm/lib/Analysis/ScalarEvolutionExpander.cpp @@ -2137,7 +2137,7 @@ bool SCEVExpander::isHighCostExpansionHelper( const SCEV *S, Loop *L, const Instruction *At, int &BudgetRemaining, - const TargetTransformInfo *TTI, SmallPtrSetImpl &Processed) { + const TargetTransformInfo &TTI, SmallPtrSetImpl &Processed) { // Was the cost of expansion of this expression already accounted for? if (!Processed.insert(S).second) return false; // We have already accounted for this expression. @@ -2145,13 +2145,16 @@ // If we can find an existing value for this scev available at the point "At" // then consider the expression cheap. if (At && getRelatedExistingExpansion(S, At, L)) - return false; + return false; // Consider the expression to be free. - // Zero/One operand expressions switch (S->getSCEVType()) { case scUnknown: case scConstant: - return false; + return false; // Assume to be zero-cost. + } + + // Zero/One operand expressions + switch (S->getSCEVType()) { case scTruncate: return isHighCostExpansionHelper(cast(S)->getOperand(), L, At, BudgetRemaining, TTI, Processed);