From ef8a4c2a65fe28e8a798a0631e34356271e5f55f Mon Sep 17 00:00:00 2001 From: Andrew Trick Date: Wed, 5 Oct 2011 22:06:53 +0000 Subject: Fixes PR11070 - assert in SCEV getConstantEvolvingPHIOperands. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141219 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/ScalarEvolution.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'lib/Analysis') diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp index ff9eaa59c7..f09f357c61 100644 --- a/lib/Analysis/ScalarEvolution.cpp +++ b/lib/Analysis/ScalarEvolution.cpp @@ -4705,23 +4705,17 @@ getConstantEvolvingPHIOperands(Instruction *UseInst, const Loop *L, if (!OpInst || !canConstantEvolve(OpInst, L)) return 0; PHINode *P = dyn_cast(OpInst); - if (P) { - if (PHI && PHI != P) return 0; // Evolving from multiple different PHIs. - PHI = P; - continue; - } - - // If this operand is already visited, reuse the prior result. - P = PHIMap.lookup(OpInst); - if (P) { - assert((!PHI || P == PHI) && "inconsistent data flow"); - PHI = P; - continue; + if (!P) + // If this operand is already visited, reuse the prior result. + // We may have P != PHI if this is the deepest point at which the + // inconsistent paths meet. + P = PHIMap.lookup(OpInst); + if (!P) { + // Recurse and memoize the results, whether a phi is found or not. + // This recursive call invalidates pointers into PHIMap. + P = getConstantEvolvingPHIOperands(OpInst, L, PHIMap); + PHIMap[OpInst] = P; } - // Recurse and memoize the results, whether a phi is found or not. - // This recursive call invalidates pointers into PHIMap. - P = getConstantEvolvingPHIOperands(OpInst, L, PHIMap); - PHIMap[OpInst] = P; if (P == 0) return 0; // Not evolving from PHI if (PHI && PHI != P) return 0; // Evolving from multiple different PHIs. PHI = P; -- cgit v1.2.3