Thanks! No idea how I managed to get them swapped!<span></span><br><br>On Wednesday, October 9, 2013, Benjamin Kramer  wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: d0k<br>
Date: Wed Oct  9 12:23:41 2013<br>
New Revision: 192303<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=192303&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=192303&view=rev</a><br>
Log:<br>
Flip the ownership of MCStreamer and MCTargetStreamer.<br>
<br>
MCStreamer now owns the target streamer. This prevents leaking the target<br>
streamer.<br>
<br>
Modified:<br>
    llvm/trunk/include/llvm/MC/MCStreamer.h<br>
    llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/MC/MCStreamer.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCStreamer.h?rev=192303&r1=192302&r2=192303&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCStreamer.h?rev=192303&r1=192302&r2=192303&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/include/llvm/MC/MCStreamer.h (original)<br>
+++ llvm/trunk/include/llvm/MC/MCStreamer.h Wed Oct  9 12:23:41 2013<br>
@@ -66,11 +66,11 @@ typedef std::pair<const MCSection *, con<br>
 /// be treated differently. Callers should always talk to a FooTargetStreamer.<br>
 class MCTargetStreamer {<br>
 protected:<br>
-  OwningPtr<MCStreamer> Streamer;<br>
+  MCStreamer *Streamer;<br>
<br>
 public:<br>
   virtual ~MCTargetStreamer();<br>
-  void setStreamer(MCStreamer *S) { Streamer.reset(S); }<br>
+  void setStreamer(MCStreamer *S) { Streamer = S; }<br>
 };<br>
<br>
 // FIXME: declared here because it is used from<br>
@@ -100,7 +100,7 @@ public:<br>
 ///<br>
 class MCStreamer {<br>
   MCContext &Context;<br>
-  MCTargetStreamer *TargetStreamer;<br>
+  OwningPtr<MCTargetStreamer> TargetStreamer;<br>
<br>
   MCStreamer(const MCStreamer &) LLVM_DELETED_FUNCTION;<br>
   MCStreamer &operator=(const MCStreamer &) LLVM_DELETED_FUNCTION;<br>
<br>
Modified: llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp?rev=192303&r1=192302&r2=192303&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp?rev=192303&r1=192302&r2=192303&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp (original)<br>
+++ llvm/trunk/lib/Target/ARM/MCTargetDesc/ARMELFStreamer.cpp Wed Oct  9 12:23:41 2013<br>
@@ -305,7 +305,7 @@ private:<br>
 } // end anonymous namespace<br>
<br>
 ARMELFStreamer &ARMTargetELFStreamer::getStreamer() {<br>
-  ARMELFStreamer *S = static_cast<ARMELFStreamer *>(Streamer.get());<br>
+  ARMELFStreamer *S = static_cast<ARMELFStreamer *>(Streamer);<br>
   return *S;<br>
 }<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="javascript:;" onclick="_e(event, 'cvml', '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>