<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Chris,<div><br></div><div>This patch broke a number of loop tests of the buildbots. I've pulled SimplifyCFG back to r121694, which, from your commit messages, was the last bug-free revision. The test you added since then is still in TOT, but XFAIL'd.</div><div><br></div><div>--Owen</div><div><br></div><div><br><div><div>On Dec 13, 2010, at 3:02 PM, Chris Lattner wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Author: lattner<br>Date: Mon Dec 13 17:02:19 2010<br>New Revision: 121728<br><br>URL: <a href="http://llvm.org/viewvc/llvm-project?rev=121728&view=rev">http://llvm.org/viewvc/llvm-project?rev=121728&view=rev</a><br>Log:<br>temporarily disable part of my previous patch, which causes an iterator invalidation issue, causing a crash on some versions of perlbmk.<br><br>Modified:<br> llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp<br> llvm/trunk/test/Transforms/SimplifyCFG/switch_create.ll<br><br>Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=121728&r1=121727&r2=121728&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=121728&r1=121727&r2=121728&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)<br>+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Mon Dec 13 17:02:19 2010<br>@@ -1515,7 +1515,7 @@<br> AddPredecessorToBlock(FalseDest, PredBlock, BB);<br> PBI->setSuccessor(1, FalseDest);<br> }<br>- return SimplifyCFG(PBI->getParent()) | true;<br>+ return SimplifyCFG(BB) | true;<br> }<br> return false;<br> }<br><br>Modified: llvm/trunk/test/Transforms/SimplifyCFG/switch_create.ll<br>URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/switch_create.ll?rev=121728&r1=121727&r2=121728&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/switch_create.ll?rev=121728&r1=121727&r2=121728&view=diff</a><br>==============================================================================<br>--- llvm/trunk/test/Transforms/SimplifyCFG/switch_create.ll (original)<br>+++ llvm/trunk/test/Transforms/SimplifyCFG/switch_create.ll Mon Dec 13 17:02:19 2010<br>@@ -253,21 +253,21 @@<br> ret i32 %conv46<br><br> ; CHECK: @test9<br>-; CHECK: %cmp = icmp ult i8 %c, 33<br>-; CHECK: br i1 %cmp, label %lor.end, label %switch.early.test<br>+; HECK: %cmp = icmp ult i8 %c, 33<br>+; HECK: br i1 %cmp, label %lor.end, label %switch.early.test<br><br>-; CHECK: switch.early.test:<br>-; CHECK: switch i8 %c, label %lor.rhs [<br>-; CHECK: i8 46, label %lor.end<br>-; CHECK: i8 44, label %lor.end<br>-; CHECK: i8 58, label %lor.end<br>-; CHECK: i8 59, label %lor.end<br>-; CHECK: i8 60, label %lor.end<br>-; CHECK: i8 62, label %lor.end<br>-; CHECK: i8 34, label %lor.end<br>-; CHECK: i8 92, label %lor.end<br>-; CHECK: i8 39, label %lor.end<br>-; CHECK: ]<br>+; HECK: switch.early.test:<br>+; HECK: switch i8 %c, label %lor.rhs [<br>+; HECK: i8 46, label %lor.end<br>+; HECK: i8 44, label %lor.end<br>+; HECK: i8 58, label %lor.end<br>+; HECK: i8 59, label %lor.end<br>+; HECK: i8 60, label %lor.end<br>+; HECK: i8 62, label %lor.end<br>+; HECK: i8 34, label %lor.end<br>+; HECK: i8 92, label %lor.end<br>+; HECK: i8 39, label %lor.end<br>+; HECK: ]<br> }<br><br> define i32 @test10(i32 %mode, i1 %Cond) {<br>@@ -331,3 +331,24 @@<br> ; CHECK: i32 4, label %return<br> ; CHECK: ]<br> }<br>+<br>+define void @test12() nounwind {<br>+entry:<br>+ br label %bb49.us.us<br>+<br>+bb49.us.us:<br>+ %A = icmp eq i32 undef, undef<br>+ br i1 %A, label %bb55.us.us, label %malformed<br>+<br>+bb48.us.us:<br>+ %B = icmp ugt i32 undef, undef<br>+ br i1 %B, label %bb55.us.us, label %bb49.us.us<br>+<br>+bb55.us.us:<br>+ br label %bb48.us.us<br>+<br>+malformed:<br>+ ret void<br>+; CHECK: @test12<br>+<br>+}<br>\ No newline at end of file<br><br><br>_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits<br></div></blockquote></div><br></div></body></html>