<div dir="ltr">Hi Duncan,<div><br></div><div>Why not use std::next(I) here?</div><div><br></div><div>Cheers,</div><div><br></div><div>James</div></div><br><div class="gmail_quote"><div dir="ltr">On Thu, 8 Oct 2015 at 23:45 Duncan P. N. Exon Smith via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dexonsmith<br>
Date: Thu Oct  8 17:43:26 2015<br>
New Revision: 249764<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=249764&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=249764&view=rev</a><br>
Log:<br>
AArch64: Stop using MachineInstr::getNextNode()<br>
<br>
Stop using `getNextNode()` to get an insertion point (at least, in this<br>
one place).  Instead, use iterator logic directly.<br>
<br>
The `getNextNode()` interface isn't actually supposed to work for<br>
creating iterators; it's supposed to return `nullptr` (not a real<br>
iterator) if this is the last node.  It's currently broken and will<br>
"happen" to work, but if we ever fix the function, we'll get some<br>
strange failures in places like this.<br>
<br>
Modified:<br>
    llvm/trunk/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp<br>
<br>
Modified: llvm/trunk/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp?rev=249764&r1=249763&r2=249764&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp?rev=249764&r1=249763&r2=249764&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp (original)<br>
+++ llvm/trunk/lib/Target/AArch64/AArch64CleanupLocalDynamicTLSPass.cpp Thu Oct  8 17:43:26 2015<br>
@@ -117,10 +117,10 @@ struct LDTLSCleanup : public MachineFunc<br>
     *TLSBaseAddrReg = RegInfo.createVirtualRegister(&AArch64::GPR64RegClass);<br>
<br>
     // Insert a copy from X0 to TLSBaseAddrReg for later.<br>
-    MachineInstr *Next = I->getNextNode();<br>
-    MachineInstr *Copy = BuildMI(*I->getParent(), Next, I->getDebugLoc(),<br>
-                                 TII->get(TargetOpcode::COPY),<br>
-                                 *TLSBaseAddrReg).addReg(AArch64::X0);<br>
+    MachineInstr *Copy =<br>
+        BuildMI(*I->getParent(), ++MachineBasicBlock::iterator(I),<br>
+                I->getDebugLoc(), TII->get(TargetOpcode::COPY), *TLSBaseAddrReg)<br>
+            .addReg(AArch64::X0);<br>
<br>
     return Copy;<br>
   }<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>