[llvm-commits] [llvm] r49831 - in /llvm/trunk: include/llvm/Support/CFG.h lib/Transforms/Utils/BreakCriticalEdges.cpp

[Scott Michel]

Author: pingbak
Date: Wed Apr 16 18:46:39 2008
New Revision: 49831

URL: http://llvm.org/viewvc/llvm-project?rev=49831&view=rev
Log:
Workaround for PR2207, in which pred_iterator assert gets triggered due to a
wee problem in Xcode 2.[45]/gcc 4.0.1.

Modified:
    llvm/trunk/include/llvm/Support/CFG.h
    llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp

Modified: llvm/trunk/include/llvm/Support/CFG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/CFG.h?rev=49831&r1=49830&r2=49831&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Support/CFG.h (original)
+++ llvm/trunk/include/llvm/Support/CFG.h Wed Apr 16 18:46:39 2008
@@ -36,8 +36,11 @@
 
   inline void advancePastNonPreds() {
     // Loop to ignore non predecessor uses (for example PHI nodes)...
-    while (!It.atEnd() && !isa<TerminatorInst>(*It) && !isa<BasicBlock>(*It))
+    while (!It.atEnd()) {
+      if (isa<TerminatorInst>(*It) || isa<BasicBlock>(*It))
+	break;
       ++It;
+    }
   }
 
   inline PredIterator(_Ptr *bb) : It(bb->use_begin()) {

Modified: llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp?rev=49831&r1=49830&r2=49831&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/BreakCriticalEdges.cpp Wed Apr 16 18:46:39 2008
@@ -103,8 +103,15 @@
   
   // If AllowIdenticalEdges is true, then we allow this edge to be considered
   // non-critical iff all preds come from TI's block.
-  for (; I != E; ++I)
-    if (*I != FirstPred) return true;
+  while (I != E) {
+    pred_const_iterator E1 = E;
+    if (*I != FirstPred)
+      return true;
+    // Note: leave this as is until no one ever compiles with either gcc 4.0.1
+    // or Xcode 2. This seems to work around the pred_iterator assert in PR 2207
+    E = pred_end(*I);
+    ++I;
+  }
   return false;
 }