[llvm-branch-commits] [llvm-branch] r182439 - Merging r181363:

[Bill Wendling]

Author: void
Date: Tue May 21 18:48:15 2013
New Revision: 182439

URL: http://llvm.org/viewvc/llvm-project?rev=182439&view=rev
Log:
Merging r181363:
------------------------------------------------------------------------
r181363 | cdavis | 2013-05-07 14:14:15 -0700 (Tue, 07 May 2013) | 3 lines

MCStreamer: Also clear vector of W64UnwindInfos on reset().

Patch by Kai Nacke!
------------------------------------------------------------------------

Modified:
    llvm/branches/release_33/   (props changed)
    llvm/branches/release_33/lib/MC/MCStreamer.cpp

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 21 18:48:15 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181286,181296,181313,181366,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181678,181706,181792,181800,181842,181864,182072,182112-182113,182344,182364,182385,182387
+/llvm/trunk:155241,181286,181296,181313,181363,181366,181397,181423,181450,181524,181529,181540,181576-181580,181586,181600,181678,181706,181792,181800,181842,181864,182072,182112-182113,182344,182364,182385,182387

Modified: llvm/branches/release_33/lib/MC/MCStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/MC/MCStreamer.cpp?rev=182439&r1=182438&r2=182439&view=diff
==============================================================================
--- llvm/branches/release_33/lib/MC/MCStreamer.cpp (original)
+++ llvm/branches/release_33/lib/MC/MCStreamer.cpp Tue May 21 18:48:15 2013
@@ -35,6 +35,7 @@ MCStreamer::~MCStreamer() {
 void MCStreamer::reset() {
   for (unsigned i = 0; i < getNumW64UnwindInfos(); ++i)
     delete W64UnwindInfos[i];
+  W64UnwindInfos.clear();
   EmitEHFrame = true;
   EmitDebugFrame = false;
   CurrentW64UnwindInfo = 0;