<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jan 22, 2015 at 8:55 AM, Adrian Prantl <span dir="ltr"><<a href="mailto:aprantl@apple.com" target="_blank">aprantl@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: adrian<br>
Date: Thu Jan 22 10:55:22 2015<br>
New Revision: 226836<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=226836&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=226836&view=rev</a><br>
Log:<br>
Rewrite DIExpression::printInternal() to use the iterator interface.<br>
NFC.<br>
<br>
Modified:<br>
    llvm/trunk/lib/IR/DebugInfo.cpp<br>
<br>
Modified: llvm/trunk/lib/IR/DebugInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=226836&r1=226835&r2=226836&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfo.cpp?rev=226836&r1=226835&r2=226836&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/IR/DebugInfo.cpp (original)<br>
+++ llvm/trunk/lib/IR/DebugInfo.cpp Thu Jan 22 10:55:22 2015<br>
@@ -1406,27 +1406,23 @@ void DIVariable::printInternal(raw_ostre<br>
 }<br>
<br>
 void DIExpression::printInternal(raw_ostream &OS) const {<br>
-  for (unsigned I = 0; I < getNumElements(); ++I) {<br>
-    uint64_t OpCode = getElement(I);<br>
+  for (auto E = end(), I = begin(); I != E; ++I) {<br>
+    uint64_t OpCode = *I;<br>
     OS << " [" << OperationEncodingString(OpCode);<br>
     switch (OpCode) {<br>
     case DW_OP_plus: {<br>
-      OS << " " << getElement(++I);<br>
+      OS << " " << I.getArg(1);<br></blockquote><div><br>It's weird to have extra functions on iterators - could the iterator instead be over a more complete object with the arguments? (this could be a lightweight object that can be copied, etc)<br><br>That change would allow this loop to be the obvious:<br><br>  for (ExprNode E : *this)<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
       break;<br>
     }<br>
     case DW_OP_piece: {<br>
-      unsigned Offset = getElement(++I);<br>
-      unsigned Size = getElement(++I);<br>
-      OS << " offset=" << Offset << ", size=" << Size;<br>
+      OS << " offset=" << I.getArg(1) << ", size=" << I.getArg(2);<br>
       break;<br>
     }<br>
     case DW_OP_deref:<br>
       // No arguments.<br>
       break;<br>
     default:<br>
-      // Else bail out early. This may be a line table entry.<br>
-      OS << "Unknown]";<br>
-      return;<br>
+      llvm_unreachable("unhandled operation");<br>
     }<br>
     OS << "]";<br>
   }<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" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>