mirror of
				https://github.com/c64scene-ar/llvm-6502.git
				synced 2025-10-31 08:16:47 +00:00 
			
		
		
		
	indvars: fix a pass-sensitivity issue that would hit the SCEVExpander
assertion I added in r135333. Check for the existence of a preheader before expanding a recurrence. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@135335 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
		| @@ -140,7 +140,7 @@ namespace { | |||||||
|  |  | ||||||
|     void RewriteIVExpressions(Loop *L, SCEVExpander &Rewriter); |     void RewriteIVExpressions(Loop *L, SCEVExpander &Rewriter); | ||||||
|  |  | ||||||
|     ICmpInst *LinearFunctionTestReplace(Loop *L, const SCEV *IVLimit, |     ICmpInst *LinearFunctionTestReplace(Loop *L, const SCEV *BackedgeTakenCount, | ||||||
|                                         PHINode *IndVar, |                                         PHINode *IndVar, | ||||||
|                                         SCEVExpander &Rewriter); |                                         SCEVExpander &Rewriter); | ||||||
|  |  | ||||||
| @@ -1823,7 +1823,18 @@ bool IndVarSimplify::runOnLoop(Loop *L, LPPassManager &LPM) { | |||||||
|            "canonical IV disrupted BackedgeTaken expansion"); |            "canonical IV disrupted BackedgeTaken expansion"); | ||||||
|     assert(NeedCannIV && |     assert(NeedCannIV && | ||||||
|            "LinearFunctionTestReplace requires a canonical induction variable"); |            "LinearFunctionTestReplace requires a canonical induction variable"); | ||||||
|     NewICmp = LinearFunctionTestReplace(L, BackedgeTakenCount, IndVar, Rewriter); |     // Check preconditions for proper SCEVExpander operation. SCEV does not | ||||||
|  |     // express SCEVExpander's dependencies, such as LoopSimplify. Instead any | ||||||
|  |     // pass that uses the SCEVExpander must do it. This does not work well for | ||||||
|  |     // loop passes because SCEVExpander makes assumptions about all loops, while | ||||||
|  |     // LoopPassManager only forces the current loop to be simplified. | ||||||
|  |     // | ||||||
|  |     // FIXME: SCEV expansion has no way to bail out, so the caller must | ||||||
|  |     // explicitly check any assumptions made by SCEV. Brittle. | ||||||
|  |     const SCEVAddRecExpr *AR = dyn_cast<SCEVAddRecExpr>(BackedgeTakenCount); | ||||||
|  |     if (!AR || AR->getLoop()->getLoopPreheader()) | ||||||
|  |       NewICmp = | ||||||
|  |         LinearFunctionTestReplace(L, BackedgeTakenCount, IndVar, Rewriter); | ||||||
|   } |   } | ||||||
|   // Rewrite IV-derived expressions. |   // Rewrite IV-derived expressions. | ||||||
|   if (!DisableIVRewrite) |   if (!DisableIVRewrite) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user