From 17fd7bda5ac08f873c063c64e1456f8960a0c765 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 19 Nov 2010 07:41:23 +0000 Subject: [PATCH] Add a MCLineSectionOrder vector so that we produce the line tables in a deterministic order. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119795 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/MC/MCContext.h | 14 +++++++++++++- include/llvm/MC/MCDwarf.h | 7 +++++-- lib/MC/MCDwarf.cpp | 25 +++++++++++++++---------- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/include/llvm/MC/MCContext.h b/include/llvm/MC/MCContext.h index cec29fad639..7d5258f7ba9 100644 --- a/include/llvm/MC/MCContext.h +++ b/include/llvm/MC/MCContext.h @@ -80,6 +80,9 @@ namespace llvm { /// The dwarf line information from the .loc directives for the sections /// with assembled machine instructions have after seeing .loc directives. DenseMap MCLineSections; + /// We need a deterministic iteration order, so we remember the order + /// the elements were added. + std::vector MCLineSectionOrder; /// Allocator - Allocator object used for creating machine code objects. /// @@ -177,9 +180,18 @@ namespace llvm { const std::vector &getMCDwarfDirs() { return MCDwarfDirs; } - DenseMap &getMCLineSections() { + + const DenseMap + &getMCLineSections() const { return MCLineSections; } + const std::vector &getMCLineSectionOrder() const { + return MCLineSectionOrder; + } + void addMCLineSection(const MCSection *Sec, MCLineSection *Line) { + MCLineSections[Sec] = Line; + MCLineSectionOrder.push_back(Sec); + } /// setCurrentDwarfLoc - saves the information from the currently parsed /// dwarf .loc directive and sets DwarfLocSeen. When the next instruction diff --git a/include/llvm/MC/MCDwarf.h b/include/llvm/MC/MCDwarf.h index 425535d3648..2ded71c988e 100644 --- a/include/llvm/MC/MCDwarf.h +++ b/include/llvm/MC/MCDwarf.h @@ -162,7 +162,7 @@ namespace llvm { MCLineEntry(MCSymbol *label, const MCDwarfLoc loc) : MCDwarfLoc(loc), Label(label) {} - MCSymbol *getLabel() { return Label; } + MCSymbol *getLabel() const { return Label; } // This is called when an instruction is assembled into the specified // section and if there is information from the last .loc directive that @@ -192,12 +192,15 @@ namespace llvm { typedef std::vector MCLineEntryCollection; typedef MCLineEntryCollection::iterator iterator; + typedef MCLineEntryCollection::const_iterator const_iterator; private: MCLineEntryCollection MCLineEntries; public: - MCLineEntryCollection *getMCLineEntries() { return &MCLineEntries; } + const MCLineEntryCollection *getMCLineEntries() const { + return &MCLineEntries; + } }; class MCDwarfFileTable { diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp index 1462d574028..67ce43d6a71 100644 --- a/lib/MC/MCDwarf.cpp +++ b/lib/MC/MCDwarf.cpp @@ -80,16 +80,16 @@ void MCLineEntry::Make(MCStreamer *MCOS, const MCSection *Section) { // Get the MCLineSection for this section, if one does not exist for this // section create it. - DenseMap &MCLineSections = + const DenseMap &MCLineSections = MCOS->getContext().getMCLineSections(); - MCLineSection *LineSection = MCLineSections[Section]; + MCLineSection *LineSection = MCLineSections.lookup(Section); if (!LineSection) { // Create a new MCLineSection. This will be deleted after the dwarf line // table is created using it by iterating through the MCLineSections // DenseMap. LineSection = new MCLineSection; // Save a pointer to the new LineSection into the MCLineSections DenseMap. - MCLineSections[Section] = LineSection; + MCOS->getContext().addMCLineSection(Section, LineSection); } // Add the line entry to this section's entries. @@ -137,7 +137,7 @@ static inline void EmitDwarfSetAddress(MCStreamer *MCOS, // static inline void EmitDwarfLineTable(MCStreamer *MCOS, const MCSection *Section, - MCLineSection *LineSection, + const MCLineSection *LineSection, const MCSection *DwarfLineSection, MCSectionData *DLS, int PointerSize) { @@ -149,7 +149,7 @@ static inline void EmitDwarfLineTable(MCStreamer *MCOS, MCSymbol *LastLabel = NULL; // Loop through each MCLineEntry and encode the dwarf line number table. - for (MCLineSection::iterator + for (MCLineSection::const_iterator it = LineSection->getMCLineEntries()->begin(), ie = LineSection->getMCLineEntries()->end(); it != ie; ++it) { @@ -321,16 +321,21 @@ void MCDwarfFileTable::Emit(MCStreamer *MCOS, MCOS->EmitLabel(ProEndSym); // Put out the line tables. - DenseMap &MCLineSections = + const DenseMap &MCLineSections = MCOS->getContext().getMCLineSections(); - for (DenseMap::iterator it = - MCLineSections.begin(), ie = MCLineSections.end(); it != ie; ++it) { - EmitDwarfLineTable(MCOS, it->first, it->second, DwarfLineSection, DLS, + const std::vector &MCLineSectionOrder = + MCOS->getContext().getMCLineSectionOrder(); + for (std::vector::const_iterator it = + MCLineSectionOrder.begin(), ie = MCLineSectionOrder.end(); it != ie; + ++it) { + const MCSection *Sec = *it; + const MCLineSection *Line = MCLineSections.lookup(Sec); + EmitDwarfLineTable(MCOS, Sec, Line, DwarfLineSection, DLS, PointerSize); // Now delete the MCLineSections that were created in MCLineEntry::Make() // and used to emit the line table. - delete it->second; + delete Line; } // This is the end of the section, so set the value of the symbol at the end