diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp index 59ea3025c89e..6d4dbf1e9761 100644 --- a/lld/MachO/Driver.cpp +++ b/lld/MachO/Driver.cpp @@ -285,7 +285,8 @@ static InputFile *addFile(StringRef path, bool forceLoadArchive) { } else if (config->forceLoadObjC) { for (const object::Archive::Symbol &sym : file->symbols()) if (sym.getName().startswith(objc::klass)) - symtab->addUndefined(sym.getName(), /*isWeakRef=*/false); + symtab->addUndefined(sym.getName(), /*file=*/nullptr, + /*isWeakRef=*/false); // TODO: no need to look for ObjC sections for a given archive member if // we already found that it contains an ObjC symbol. We should also @@ -510,7 +511,7 @@ static void replaceCommonSymbols() { continue; auto *isec = make(); - isec->file = common->file; + isec->file = common->getFile(); isec->name = section_names::common; isec->segname = segment_names::data; isec->align = common->align; @@ -521,7 +522,7 @@ static void replaceCommonSymbols() { isec->flags = S_ZEROFILL; inputSections.push_back(isec); - replaceSymbol(sym, sym->getName(), isec, /*value=*/0, + replaceSymbol(sym, sym->getName(), isec->file, isec, /*value=*/0, /*isWeakDef=*/false, /*isExternal=*/true, common->privateExtern); } @@ -721,6 +722,7 @@ bool macho::link(ArrayRef argsArr, bool canExitEarly, target = createTargetInfo(args); config->entry = symtab->addUndefined(args.getLastArgValue(OPT_e, "_main"), + /*file=*/nullptr, /*isWeakRef=*/false); config->outputFile = args.getLastArgValue(OPT_o, "a.out"); config->installName = diff --git a/lld/MachO/ExportTrie.cpp b/lld/MachO/ExportTrie.cpp index bd0c0004309c..478e81a493f7 100644 --- a/lld/MachO/ExportTrie.cpp +++ b/lld/MachO/ExportTrie.cpp @@ -44,7 +44,6 @@ #include "llvm/Support/LEB128.h" using namespace llvm; -using namespace llvm::MachO; using namespace lld; using namespace lld::macho; @@ -62,6 +61,7 @@ struct ExportInfo { uint8_t flags = 0; ExportInfo(const Symbol &sym, uint64_t imageBase) : address(sym.getVA() - imageBase) { + using namespace llvm::MachO; // Set the symbol type. if (sym.isWeakDef()) flags |= EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION; diff --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp index d75a857f5c8d..3fc3f436eb3e 100644 --- a/lld/MachO/InputFiles.cpp +++ b/lld/MachO/InputFiles.cpp @@ -336,23 +336,23 @@ static macho::Symbol *createDefined(const structs::nlist_64 &sym, if (sym.n_type & (N_EXT | N_PEXT)) { assert((sym.n_type & N_EXT) && "invalid input"); - return symtab->addDefined(name, isec, value, sym.n_desc & N_WEAK_DEF, - sym.n_type & N_PEXT); + return symtab->addDefined(name, isec->file, isec, value, + sym.n_desc & N_WEAK_DEF, sym.n_type & N_PEXT); } - return make(name, isec, value, sym.n_desc & N_WEAK_DEF, + return make(name, isec->file, isec, value, sym.n_desc & N_WEAK_DEF, /*isExternal=*/false, /*isPrivateExtern=*/false); } // Absolute symbols are defined symbols that do not have an associated // InputSection. They cannot be weak. static macho::Symbol *createAbsolute(const structs::nlist_64 &sym, - StringRef name) { + InputFile *file, StringRef name) { if (sym.n_type & (N_EXT | N_PEXT)) { assert((sym.n_type & N_EXT) && "invalid input"); - return symtab->addDefined(name, nullptr, sym.n_value, /*isWeakDef=*/false, - sym.n_type & N_PEXT); + return symtab->addDefined(name, file, nullptr, sym.n_value, + /*isWeakDef=*/false, sym.n_type & N_PEXT); } - return make(name, nullptr, sym.n_value, /*isWeakDef=*/false, + return make(name, file, nullptr, sym.n_value, /*isWeakDef=*/false, /*isExternal=*/false, /*isPrivateExtern=*/false); } @@ -362,12 +362,12 @@ macho::Symbol *ObjFile::parseNonSectionSymbol(const structs::nlist_64 &sym, switch (type) { case N_UNDF: return sym.n_value == 0 - ? symtab->addUndefined(name, sym.n_desc & N_WEAK_REF) + ? symtab->addUndefined(name, this, sym.n_desc & N_WEAK_REF) : symtab->addCommon(name, this, sym.n_value, 1 << GET_COMM_ALIGN(sym.n_desc), sym.n_type & N_PEXT); case N_ABS: - return createAbsolute(sym, name); + return createAbsolute(sym, this, name); case N_PBUD: case N_INDR: error("TODO: support symbols of type " + std::to_string(type)); diff --git a/lld/MachO/SymbolTable.cpp b/lld/MachO/SymbolTable.cpp index 2f0844fadaaa..78e807b99b91 100644 --- a/lld/MachO/SymbolTable.cpp +++ b/lld/MachO/SymbolTable.cpp @@ -37,9 +37,9 @@ std::pair SymbolTable::insert(StringRef name) { return {sym, true}; } -Symbol *SymbolTable::addDefined(StringRef name, InputSection *isec, - uint32_t value, bool isWeakDef, - bool isPrivateExtern) { +Symbol *SymbolTable::addDefined(StringRef name, InputFile *file, + InputSection *isec, uint32_t value, + bool isWeakDef, bool isPrivateExtern) { Symbol *s; bool wasInserted; bool overridesWeakDef = false; @@ -54,8 +54,11 @@ Symbol *SymbolTable::addDefined(StringRef name, InputSection *isec, defined->privateExtern &= isPrivateExtern; return s; } - if (!defined->isWeakDef()) - error("duplicate symbol: " + name); + if (!defined->isWeakDef()) { + error("duplicate symbol: " + name + "\n>>> defined in " + + toString(defined->getFile()) + "\n>>> defined in " + + toString(file)); + } } else if (auto *dysym = dyn_cast(s)) { overridesWeakDef = !isWeakDef && dysym->isWeakDef(); } @@ -64,13 +67,14 @@ Symbol *SymbolTable::addDefined(StringRef name, InputSection *isec, } Defined *defined = - replaceSymbol(s, name, isec, value, isWeakDef, + replaceSymbol(s, name, file, isec, value, isWeakDef, /*isExternal=*/true, isPrivateExtern); defined->overridesWeakDef = overridesWeakDef; return s; } -Symbol *SymbolTable::addUndefined(StringRef name, bool isWeakRef) { +Symbol *SymbolTable::addUndefined(StringRef name, InputFile *file, + bool isWeakRef) { Symbol *s; bool wasInserted; std::tie(s, wasInserted) = insert(name); @@ -78,7 +82,7 @@ Symbol *SymbolTable::addUndefined(StringRef name, bool isWeakRef) { auto refState = isWeakRef ? RefState::Weak : RefState::Strong; if (wasInserted) - replaceSymbol(s, name, refState); + replaceSymbol(s, name, file, refState); else if (auto *lazy = dyn_cast(s)) lazy->fetchArchiveMember(); else if (auto *dynsym = dyn_cast(s)) @@ -162,11 +166,12 @@ Symbol *SymbolTable::addDSOHandle(const MachHeaderSection *header) { return s; } -void lld::macho::treatUndefinedSymbol(StringRef symbolName, - StringRef fileName) { - std::string message = ("undefined symbol: " + symbolName).str(); +void lld::macho::treatUndefinedSymbol(const Undefined &sym) { + std::string message = "undefined symbol: " + toString(sym); + std::string fileName = toString(sym.getFile()); + if (!fileName.empty()) - message += ("\n>>> referenced by " + fileName).str(); + message += "\n>>> referenced by " + fileName; switch (config->undefinedSymbolTreatment) { case UndefinedSymbolTreatment::suppress: break; diff --git a/lld/MachO/SymbolTable.h b/lld/MachO/SymbolTable.h index 871687f75eb7..15a784429856 100644 --- a/lld/MachO/SymbolTable.h +++ b/lld/MachO/SymbolTable.h @@ -20,9 +20,11 @@ namespace macho { class ArchiveFile; class DylibFile; class InputFile; +class ObjFile; class InputSection; class MachHeaderSection; class Symbol; +class Undefined; /* * Note that the SymbolTable handles name collisions by calling @@ -32,10 +34,10 @@ class Symbol; */ class SymbolTable { public: - Symbol *addDefined(StringRef name, InputSection *isec, uint32_t value, - bool isWeakDef, bool isPrivateExtern); + Symbol *addDefined(StringRef name, InputFile *, InputSection *, + uint32_t value, bool isWeakDef, bool isPrivateExtern); - Symbol *addUndefined(StringRef name, bool isWeakRef); + Symbol *addUndefined(StringRef name, InputFile *, bool isWeakRef); Symbol *addCommon(StringRef name, InputFile *, uint64_t size, uint32_t align, bool isPrivateExtern); @@ -56,7 +58,7 @@ private: std::vector symVector; }; -extern void treatUndefinedSymbol(StringRef symbolName, StringRef fileName); +void treatUndefinedSymbol(const Undefined &); extern SymbolTable *symtab; diff --git a/lld/MachO/Symbols.cpp b/lld/MachO/Symbols.cpp index 4c83188fd259..69ca1f6bb888 100644 --- a/lld/MachO/Symbols.cpp +++ b/lld/MachO/Symbols.cpp @@ -44,7 +44,7 @@ uint64_t Defined::getFileOffset() const { return isec->getFileOffset() + value; } -void LazySymbol::fetchArchiveMember() { file->fetch(sym); } +void LazySymbol::fetchArchiveMember() { getFile()->fetch(sym); } uint64_t DSOHandle::getVA() const { return header->addr; } diff --git a/lld/MachO/Symbols.h b/lld/MachO/Symbols.h index 7f987c722a1f..32996015c5b5 100644 --- a/lld/MachO/Symbols.h +++ b/lld/MachO/Symbols.h @@ -9,6 +9,7 @@ #ifndef LLD_MACHO_SYMBOLS_H #define LLD_MACHO_SYMBOLS_H +#include "InputFiles.h" #include "InputSection.h" #include "Target.h" #include "lld/Common/ErrorHandler.h" @@ -21,8 +22,6 @@ namespace macho { class InputSection; class MachHeaderSection; -class DylibFile; -class ArchiveFile; struct StringRefZ { StringRefZ(const char *s) : data(s), size(-1) {} @@ -83,20 +82,23 @@ public: uint32_t symtabIndex = UINT32_MAX; + InputFile *getFile() const { return file; } + protected: - Symbol(Kind k, StringRefZ name) - : symbolKind(k), nameData(name.data), nameSize(name.size) {} + Symbol(Kind k, StringRefZ name, InputFile *file) + : symbolKind(k), nameData(name.data), nameSize(name.size), file(file) {} Kind symbolKind; const char *nameData; mutable uint32_t nameSize; + InputFile *file; }; class Defined : public Symbol { public: - Defined(StringRefZ name, InputSection *isec, uint32_t value, bool isWeakDef, - bool isExternal, bool isPrivateExtern) - : Symbol(DefinedKind, name), isec(isec), value(value), + Defined(StringRefZ name, InputFile *file, InputSection *isec, uint32_t value, + bool isWeakDef, bool isExternal, bool isPrivateExtern) + : Symbol(DefinedKind, name, file), isec(isec), value(value), overridesWeakDef(false), privateExtern(isPrivateExtern), weakDef(isWeakDef), external(isExternal) {} @@ -116,6 +118,7 @@ public: static bool classof(const Symbol *s) { return s->kind() == DefinedKind; } + InputFile *file; InputSection *isec; uint32_t value; @@ -136,8 +139,8 @@ enum class RefState : uint8_t { Unreferenced = 0, Weak = 1, Strong = 2 }; class Undefined : public Symbol { public: - Undefined(StringRefZ name, RefState refState) - : Symbol(UndefinedKind, name), refState(refState) { + Undefined(StringRefZ name, InputFile *file, RefState refState) + : Symbol(UndefinedKind, name, file), refState(refState) { assert(refState != RefState::Unreferenced); } @@ -167,7 +170,7 @@ class CommonSymbol : public Symbol { public: CommonSymbol(StringRefZ name, InputFile *file, uint64_t size, uint32_t align, bool isPrivateExtern) - : Symbol(CommonKind, name), file(file), size(size), + : Symbol(CommonKind, name, file), size(size), align(align != 1 ? align : llvm::PowerOf2Ceil(size)), privateExtern(isPrivateExtern) { // TODO: cap maximum alignment @@ -175,7 +178,6 @@ public: static bool classof(const Symbol *s) { return s->kind() == CommonKind; } - InputFile *const file; const uint64_t size; const uint32_t align; const bool privateExtern; @@ -185,18 +187,18 @@ class DylibSymbol : public Symbol { public: DylibSymbol(DylibFile *file, StringRefZ name, bool isWeakDef, RefState refState, bool isTlv) - : Symbol(DylibKind, name), file(file), refState(refState), - weakDef(isWeakDef), tlv(isTlv) {} + : Symbol(DylibKind, name, file), refState(refState), weakDef(isWeakDef), + tlv(isTlv) {} bool isWeakDef() const override { return weakDef; } bool isWeakRef() const override { return refState == RefState::Weak; } bool isReferenced() const { return refState != RefState::Unreferenced; } bool isTlv() const override { return tlv; } bool hasStubsHelper() const { return stubsHelperIndex != UINT32_MAX; } + DylibFile *getFile() const { return cast(file); } static bool classof(const Symbol *s) { return s->kind() == DylibKind; } - DylibFile *file; uint32_t stubsHelperIndex = UINT32_MAX; uint32_t lazyBindOffset = UINT32_MAX; @@ -210,14 +212,14 @@ private: class LazySymbol : public Symbol { public: LazySymbol(ArchiveFile *file, const llvm::object::Archive::Symbol &sym) - : Symbol(LazyKind, sym.getName()), file(file), sym(sym) {} + : Symbol(LazyKind, sym.getName(), file), sym(sym) {} + + ArchiveFile *getFile() const { return cast(file); } + void fetchArchiveMember(); static bool classof(const Symbol *s) { return s->kind() == LazyKind; } - void fetchArchiveMember(); - private: - ArchiveFile *file; const llvm::object::Archive::Symbol sym; }; @@ -235,7 +237,7 @@ private: class DSOHandle : public Symbol { public: DSOHandle(const MachHeaderSection *header) - : Symbol(DSOHandleKind, name), header(header) {} + : Symbol(DSOHandleKind, name, nullptr), header(header) {} const MachHeaderSection *header; diff --git a/lld/MachO/SyntheticSections.cpp b/lld/MachO/SyntheticSections.cpp index a5696fc9d390..4fa03b5fccd9 100644 --- a/lld/MachO/SyntheticSections.cpp +++ b/lld/MachO/SyntheticSections.cpp @@ -265,15 +265,15 @@ static void encodeBinding(const Symbol *sym, const OutputSection *osec, static void encodeDylibOrdinal(const DylibSymbol *dysym, Binding &lastBinding, raw_svector_ostream &os) { using namespace llvm::MachO; - if (lastBinding.ordinal != dysym->file->ordinal) { - if (dysym->file->ordinal <= BIND_IMMEDIATE_MASK) { + if (lastBinding.ordinal != dysym->getFile()->ordinal) { + if (dysym->getFile()->ordinal <= BIND_IMMEDIATE_MASK) { os << static_cast(BIND_OPCODE_SET_DYLIB_ORDINAL_IMM | - dysym->file->ordinal); + dysym->getFile()->ordinal); } else { os << static_cast(BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB); - encodeULEB128(dysym->file->ordinal, os); + encodeULEB128(dysym->getFile()->ordinal, os); } - lastBinding.ordinal = dysym->file->ordinal; + lastBinding.ordinal = dysym->getFile()->ordinal; } } @@ -442,10 +442,9 @@ void StubHelperSection::setup() { in.got->addEntry(stubBinder); inputSections.push_back(in.imageLoaderCache); - dyldPrivate = - make("__dyld_private", in.imageLoaderCache, 0, - /*isWeakDef=*/false, - /*isExternal=*/false, /*isPrivateExtern=*/false); + dyldPrivate = make("__dyld_private", nullptr, in.imageLoaderCache, 0, + /*isWeakDef=*/false, + /*isExternal=*/false, /*isPrivateExtern=*/false); } ImageLoaderCacheSection::ImageLoaderCacheSection() { @@ -522,12 +521,12 @@ uint32_t LazyBindingSection::encode(const DylibSymbol &sym) { uint64_t offset = in.lazyPointers->addr - dataSeg->firstSection()->addr + sym.stubsIndex * WordSize; encodeULEB128(offset, os); - if (sym.file->ordinal <= MachO::BIND_IMMEDIATE_MASK) { + if (sym.getFile()->ordinal <= MachO::BIND_IMMEDIATE_MASK) { os << static_cast(MachO::BIND_OPCODE_SET_DYLIB_ORDINAL_IMM | - sym.file->ordinal); + sym.getFile()->ordinal); } else { os << static_cast(MachO::BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB); - encodeULEB128(sym.file->ordinal, os); + encodeULEB128(sym.getFile()->ordinal, os); } uint8_t flags = MachO::BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM; @@ -786,7 +785,7 @@ void SymtabSection::writeTo(uint8_t *buf) const { nList->n_desc |= defined->isExternalWeakDef() ? MachO::N_WEAK_DEF : 0; } else if (auto *dysym = dyn_cast(entry.sym)) { uint16_t n_desc = nList->n_desc; - MachO::SET_LIBRARY_ORDINAL(n_desc, dysym->file->ordinal); + MachO::SET_LIBRARY_ORDINAL(n_desc, dysym->getFile()->ordinal); nList->n_type = MachO::N_EXT; n_desc |= dysym->isWeakRef() ? MachO::N_WEAK_REF : 0; nList->n_desc = n_desc; diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp index 81df8dece173..2c06a1a39a84 100644 --- a/lld/MachO/Writer.cpp +++ b/lld/MachO/Writer.cpp @@ -439,8 +439,8 @@ void Writer::scanRelocations() { if (target->hasAttr(r.type, RelocAttrBits::SUBTRAHEND)) continue; if (auto *sym = r.referent.dyn_cast()) { - if (isa(sym)) - treatUndefinedSymbol(toString(*sym), toString(isec->file)); + if (auto *undefined = dyn_cast(sym)) + treatUndefinedSymbol(*undefined); else if (target->validateSymbolRelocation(sym, isec, r)) prepareSymbolRelocation(sym, isec, r); } else { @@ -458,7 +458,8 @@ void Writer::scanSymbols() { if (defined->overridesWeakDef) in.weakBinding->addNonWeakDefinition(defined); } else if (const auto *dysym = dyn_cast(sym)) { - dysym->file->refState = std::max(dysym->file->refState, dysym->refState); + dysym->getFile()->refState = + std::max(dysym->getFile()->refState, dysym->refState); } } } diff --git a/lld/test/MachO/invalid/abs-duplicate.s b/lld/test/MachO/invalid/abs-duplicate.s index ba0bbdbb5300..1cd11d6ef4a2 100644 --- a/lld/test/MachO/invalid/abs-duplicate.s +++ b/lld/test/MachO/invalid/abs-duplicate.s @@ -4,7 +4,9 @@ # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/weakfoo.s -o %t/weakfoo.o # RUN: not %lld -lSystem %t/test.o %t/weakfoo.o -o %t/test 2>&1 | FileCheck %s -# CHECK: lld: error: duplicate symbol: _weakfoo +# CHECK: error: duplicate symbol: _weakfoo +# CHECK-NEXT: >>> defined in {{.*}}/test.o +# CHECK-NEXT: >>> defined in {{.*}}/weakfoo.o #--- weakfoo.s .globl _weakfoo diff --git a/lld/test/MachO/invalid/duplicate-symbol.s b/lld/test/MachO/invalid/duplicate-symbol.s index 392630a7f075..fc9fd7614630 100644 --- a/lld/test/MachO/invalid/duplicate-symbol.s +++ b/lld/test/MachO/invalid/duplicate-symbol.s @@ -1,10 +1,12 @@ # REQUIRES: x86 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t-dup.o -# RUN: not %lld -o /dev/null %t-dup.o %t.o 2>&1 | FileCheck %s -# RUN: not %lld -o /dev/null %t.o %t.o 2>&1 | FileCheck %s +# RUN: not %lld -o /dev/null %t-dup.o %t.o 2>&1 | FileCheck %s -DFILE_1=%t-dup.o -DFILE_2=%t.o +# RUN: not %lld -o /dev/null %t.o %t.o 2>&1 | FileCheck %s -DFILE_1=%t.o -DFILE_2=%t.o -# CHECK: error: duplicate symbol: _main +# CHECK: error: duplicate symbol: _main +# CHECK-NEXT: >>> defined in [[FILE_1]] +# CHECK-NEXT: >>> defined in [[FILE_2]] .text .global _main