ld64-133.3.tar.gz

[apple/ld64.git] / src / ld / SymbolTable.h

diff --git a/src/ld/SymbolTable.h b/src/ld/SymbolTable.h
index f352a51c4c6bd8545858f50a7b98f9cffc5253f6..451d0641fc32420bba3f4007c023afa63a7cca77 100644 (file)
--- a/src/ld/SymbolTable.h
+++ b/src/ld/SymbolTable.h
@@ -93,6 +93,9 @@ private:
 
        typedef std::map<IndirectBindingSlot, const char*> SlotToName;
        typedef __gnu_cxx::hash_map<const char*, CStringToSlot*, __gnu_cxx::hash<const char*>, CStringEquals> NameToMap;
+    
+    typedef std::vector<const ld::Atom *> DuplicatedSymbolAtomList;
+    typedef std::map<const char *, DuplicatedSymbolAtomList * > DuplicateSymbols;
        
 public:
 
@@ -126,17 +129,24 @@ public:
        byNameIterator          begin()                                                         { return byNameIterator(_byNameTable.begin(),_indirectBindingTable); }
        byNameIterator          end()                                                           { return byNameIterator(_byNameTable.end(),_indirectBindingTable); }
        void                            printStatistics();
-       static const char*              demangle(const char* sym);
        
        // from ld::IndirectBindingTable
        virtual const char*                     indirectName(IndirectBindingSlot slot) const;
        virtual const ld::Atom*         indirectAtom(IndirectBindingSlot slot) const;
+    
+    // Prints the duplicated symbols to stderr and throws. Only valid to call if hasDuplicateSymbols() returns true.
+    void                checkDuplicateSymbols() const;
+
 
 private:
        bool                                    addByName(const ld::Atom& atom, bool ignoreDuplicates);
        bool                                    addByContent(const ld::Atom& atom);
        bool                                    addByReferences(const ld::Atom& atom);
        void                                    markCoalescedAway(const ld::Atom* atom);
+    
+    // Tracks duplicated symbols. Each call adds file to the list of files defining symbol.
+    // The file list is uniqued per symbol, so calling multiple times for the same symbol/file pair is permitted.
+    void                    addDuplicateSymbol(const char *symbol, const ld::Atom* atom);
 
        const Options&                                  _options;
        NameToSlot                                              _byNameTable;
@@ -154,7 +164,7 @@ private:
        std::vector<const ld::Atom*>&   _indirectBindingTable;
        bool                                                    _hasExternalTentativeDefinitions;
        
-       static bool                                             _s_doDemangle;
+    DuplicateSymbols                _duplicateSymbols;
 
 };