While replacing an MDNode elment, properly update MDNode's operand list.

[oota-llvm.git] / lib / MC / MCAssembler.cpp

diff --git a/lib/MC/MCAssembler.cpp b/lib/MC/MCAssembler.cpp
index 0d9b540d15eff00f644387dea5cc18996446a045..0afdf98cbe797a6b80470e8c7b12694080b508cd 100644 (file)
--- a/lib/MC/MCAssembler.cpp
+++ b/lib/MC/MCAssembler.cpp
@@ -331,7 +331,7 @@ public:
 
   void WriteNlist32(MachSymbolData &MSD) {
     MCSymbolData &Data = *MSD.SymbolData;
-    MCSymbol &Symbol = Data.getSymbol();
+    const MCSymbol &Symbol = Data.getSymbol();
     uint8_t Type = 0;
     uint16_t Flags = Data.getFlags();
     uint32_t Address = 0;
@@ -592,7 +592,7 @@ public:
     // files.
     for (MCAssembler::symbol_iterator it = Asm.symbol_begin(),
            ie = Asm.symbol_end(); it != ie; ++it) {
-      MCSymbol &Symbol = it->getSymbol();
+      const MCSymbol &Symbol = it->getSymbol();
 
       // Ignore assembler temporaries.
       if (it->getSymbol().isTemporary())
@@ -628,7 +628,7 @@ public:
     // Now add the data for local symbols.
     for (MCAssembler::symbol_iterator it = Asm.symbol_begin(),
            ie = Asm.symbol_end(); it != ie; ++it) {
-      MCSymbol &Symbol = it->getSymbol();
+      const MCSymbol &Symbol = it->getSymbol();
 
       // Ignore assembler temporaries.
       if (it->getSymbol().isTemporary())
@@ -926,11 +926,11 @@ MCSectionData::LookupFixup(const MCFragment *Fragment, uint64_t Offset) const {
                                                        
 /* *** */
 
-MCSymbolData::MCSymbolData() : Symbol(*(MCSymbol*)0) {}
+MCSymbolData::MCSymbolData() : Symbol(0) {}
 
-MCSymbolData::MCSymbolData(MCSymbol &_Symbol, MCFragment *_Fragment,
+MCSymbolData::MCSymbolData(const MCSymbol &_Symbol, MCFragment *_Fragment,
                            uint64_t _Offset, MCAssembler *A)
-  : Symbol(_Symbol), Fragment(_Fragment), Offset(_Offset),
+  : Symbol(&_Symbol), Fragment(_Fragment), Offset(_Offset),
     IsExternal(false), IsPrivateExtern(false),
     CommonSize(0), CommonAlign(0), Flags(0), Index(0)
 {
@@ -940,9 +940,8 @@ MCSymbolData::MCSymbolData(MCSymbol &_Symbol, MCFragment *_Fragment,
 
 /* *** */
 
-MCAssembler::MCAssembler(raw_ostream &_OS)
-  : OS(_OS),
-    SubsectionsViaSymbols(false)
+MCAssembler::MCAssembler(MCContext &_Context, raw_ostream &_OS)
+  : Context(_Context), OS(_OS), SubsectionsViaSymbols(false)
 {
 }