[llvm] r238582 - Store MCSymbols in PendingLabels.

[Rafael Espindola]

Author: rafael
Date: Fri May 29 12:41:59 2015
New Revision: 238582

URL: http://llvm.org/viewvc/llvm-project?rev=238582&view=rev
Log:
Store MCSymbols in PendingLabels.

Modified:
    llvm/trunk/include/llvm/MC/MCObjectStreamer.h
    llvm/trunk/lib/MC/MCObjectStreamer.cpp

Modified: llvm/trunk/include/llvm/MC/MCObjectStreamer.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCObjectStreamer.h?rev=238582&r1=238581&r2=238582&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCObjectStreamer.h (original)
+++ llvm/trunk/include/llvm/MC/MCObjectStreamer.h Fri May 29 12:41:59 2015
@@ -38,7 +38,7 @@ class MCObjectStreamer : public MCStream
   MCSection::iterator CurInsertionPoint;
   bool EmitEHFrame;
   bool EmitDebugFrame;
-  SmallVector<MCSymbolData *, 2> PendingLabels;
+  SmallVector<MCSymbol *, 2> PendingLabels;
 
   virtual void EmitInstToData(const MCInst &Inst, const MCSubtargetInfo&) = 0;
   void EmitCFIStartProcImpl(MCDwarfFrameInfo &Frame) override;

Modified: llvm/trunk/lib/MC/MCObjectStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCObjectStreamer.cpp?rev=238582&r1=238581&r2=238582&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCObjectStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCObjectStreamer.cpp Fri May 29 12:41:59 2015
@@ -46,7 +46,8 @@ void MCObjectStreamer::flushPendingLabel
       CurSection->getFragmentList().insert(CurInsertionPoint, F);
       F->setParent(CurSection);
     }
-    for (MCSymbolData *SD : PendingLabels) {
+    for (MCSymbol *Sym : PendingLabels) {
+      MCSymbolData *SD = &Sym->getData();
       SD->setFragment(F);
       SD->setOffset(FOffset);
     }
@@ -174,7 +175,7 @@ void MCObjectStreamer::EmitLabel(MCSymbo
     SD.setFragment(F);
     SD.setOffset(F->getContents().size());
   } else {
-    PendingLabels.push_back(&SD);
+    PendingLabels.push_back(Symbol);
   }
 }