<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">This is borked. Fixing now.<div><br><div><div>On Apr 28, 2013, at 10:13 PM, Michael Gottesman <<a href="mailto:mgottesman@apple.com">mgottesman@apple.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">Author: mgottesman<br>Date: Mon Apr 29 00:13:13 2013<br>New Revision: 180693<br><br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project?rev=180693&view=rev">http://llvm.org/viewvc/llvm-project?rev=180693&view=rev</a><br>Log:<br>[objc-arc-annotations] Moved the disabling of call movement to ConnectTDBUTraversals so that I can prevent Changed = true from being set. This prevents an infinite loop.<br><br>Modified:<br> llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp<br><br>Modified: llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp<br>URL:<span class="Apple-converted-space"> </span><a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp?rev=180693&r1=180692&r2=180693&view=diff">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp?rev=180693&r1=180692&r2=180693&view=diff</a><br>==============================================================================<br>--- llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp (original)<br>+++ llvm/trunk/lib/Transforms/ObjCARC/ObjCARCOpts.cpp Mon Apr 29 00:13:13 2013<br>@@ -2581,6 +2581,11 @@ ObjCARCOpt::ConnectTDBUTraversals(DenseM<br> // long as the existing imbalances are maintained.<br> if (OldDelta != 0)<br> return false;<br>+ <br>+#ifdef ARC_ANNOTATIONS<br>+ // Do not move calls if ARC annotations are requested.<br>+ return false;<br>+#endif // ARC_ANNOTATIONS<br><br> Changed = true;<br> assert(OldCount != 0 && "Unreachable code?");<br>@@ -2644,12 +2649,6 @@ ObjCARCOpt::PerformCodePlacement(DenseMa<br> ReleasesToMove, Arg, KnownSafe,<br> AnyPairsCompletelyEliminated);<br><br>-#ifdef ARC_ANNOTATIONS<br>- // Do not move calls if ARC annotations are requested. If we were to move<br>- // calls in this case, we would not be able<br>- PerformMoveCalls = PerformMoveCalls && !EnableARCAnnotations;<br>-#endif // ARC_ANNOTATIONS<br>-<br> if (PerformMoveCalls) {<br> // Ok, everything checks out and we're all set. Let's move/delete some<br> // code!<br><br><br>_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br><a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a></div></blockquote></div><br></div></body></html>