diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/MC/MCContext.cpp | 4 | ||||
-rw-r--r-- | lib/MC/MCDwarf.cpp | 13 | ||||
-rw-r--r-- | lib/MC/MCObjectStreamer.cpp | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/lib/MC/MCContext.cpp b/lib/MC/MCContext.cpp index 6ffe25982d..f5f3bddcb2 100644 --- a/lib/MC/MCContext.cpp +++ b/lib/MC/MCContext.cpp @@ -84,7 +84,7 @@ void MCContext::reset() { Symbols.clear(); Allocator.Reset(); Instances.clear(); - MCDwarfFileTablesCUMap.clear(); + MCDwarfLineTablesCUMap.clear(); MCGenDwarfLabelEntries.clear(); DwarfDebugFlags = StringRef(); DwarfCompileUnitID = 0; @@ -337,7 +337,7 @@ const MCSectionCOFF *MCContext::getCOFFSection(StringRef Section) { /// allocated file number is returned. The file numbers may be in any order. unsigned MCContext::GetDwarfFile(StringRef Directory, StringRef FileName, unsigned FileNumber, unsigned CUID) { - MCDwarfFileTable &Table = MCDwarfFileTablesCUMap[CUID]; + MCDwarfLineTable &Table = MCDwarfLineTablesCUMap[CUID]; return Table.getFile(Directory, FileName, FileNumber); } diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp index 81ba40e964..181e73dd43 100644 --- a/lib/MC/MCDwarf.cpp +++ b/lib/MC/MCDwarf.cpp @@ -82,7 +82,7 @@ void MCLineEntry::Make(MCStreamer *MCOS, const MCSection *Section) { // Add the line entry to this section's entries. MCOS->getContext() - .getMCDwarfFileTable(MCOS->getContext().getDwarfCompileUnitID()) + .getMCDwarfLineTable(MCOS->getContext().getDwarfCompileUnitID()) .getMCLineSections() .addLineEntry(LineEntry, Section); } @@ -204,14 +204,14 @@ EmitDwarfLineTable(MCStreamer *MCOS, const MCSection *Section, // // This emits the Dwarf file and the line tables. // -const MCSymbol *MCDwarfFileTable::Emit(MCStreamer *MCOS) { +const MCSymbol *MCDwarfLineTable::Emit(MCStreamer *MCOS) { MCContext &context = MCOS->getContext(); // CUID and MCLineTableSymbols are set in DwarfDebug, when DwarfDebug does // not exist, CUID will be 0 and MCLineTableSymbols will be empty. // Handle Compile Unit 0, the line table start symbol is the section symbol. - auto I = MCOS->getContext().getMCDwarfFileTables().begin(), - E = MCOS->getContext().getMCDwarfFileTables().end(); + auto I = MCOS->getContext().getMCDwarfLineTables().begin(), + E = MCOS->getContext().getMCDwarfLineTables().end(); // Switch to the section where the table will be emitted into. MCOS->SwitchSection(context.getObjectFileInfo()->getDwarfLineSection()); @@ -303,7 +303,7 @@ std::pair<MCSymbol *, MCSymbol *> MCDwarfLineTableHeader::Emit(MCStreamer *MCOS) return std::make_pair(LineStartSym, LineEndSym); } -const MCSymbol *MCDwarfFileTable::EmitCU(MCStreamer *MCOS) const { +const MCSymbol *MCDwarfLineTable::EmitCU(MCStreamer *MCOS) const { MCSymbol *LineStartSym; MCSymbol *LineEndSym; std::tie(LineStartSym, LineEndSym) = Header.Emit(MCOS); @@ -331,7 +331,8 @@ const MCSymbol *MCDwarfFileTable::EmitCU(MCStreamer *MCOS) const { return LineStartSym; } -unsigned MCDwarfFileTable::getFile(StringRef Directory, StringRef FileName, unsigned FileNumber) { +unsigned MCDwarfLineTable::getFile(StringRef Directory, StringRef FileName, + unsigned FileNumber) { return Header.getFile(Directory, FileName, FileNumber); } diff --git a/lib/MC/MCObjectStreamer.cpp b/lib/MC/MCObjectStreamer.cpp index 996cf5c09b..6b2234eeb3 100644 --- a/lib/MC/MCObjectStreamer.cpp +++ b/lib/MC/MCObjectStreamer.cpp @@ -380,7 +380,7 @@ void MCObjectStreamer::FinishImpl() { // Dump out the dwarf file & directory tables and line tables. const MCSymbol *LineSectionSymbol = NULL; if (getContext().hasMCLineSections()) - LineSectionSymbol = MCDwarfFileTable::Emit(this); + LineSectionSymbol = MCDwarfLineTable::Emit(this); // If we are generating dwarf for assembly source files dump out the sections. if (getContext().getGenDwarfForAssembly()) |