Also, for .o files, include full path as given on link command line.
Before:
lld: error: undefined symbol [...], referenced from sandbox_logging.o
After:
lld: error: undefined symbol [...], referenced from libseatbelt.a(sandbox_logging.o)
Move archiveName up to InputFile so we can consistently use toString()
to print InputFiles in diags, and pass it to the ObjFile ctor. This
matches the ELF and COFF ports.
Differential Revision: https://reviews.llvm.org/D92437
// Get filename to use for linker script processing.
StringRef getNameForScript() const;
- // Filename of .a which contained this file. If this file was
- // not in an archive file, it is the empty string. We use this
- // string for creating error messages.
+ // If not empty, this stores the name of the archive containing this file.
+ // We use this string for creating error messages.
std::string archiveName;
// If this is an architecture-specific file, the following members
if (config->allLoad || forceLoadArchive) {
if (Optional<MemoryBufferRef> buffer = readFile(path)) {
for (const ArchiveMember &member : getArchiveMembers(*buffer)) {
- auto file = make<ObjFile>(member.mbref, member.modTime);
- file->archiveName = buffer->getBufferIdentifier();
- inputFiles.push_back(file);
+ inputFiles.push_back(
+ make<ObjFile>(member.mbref, member.modTime, path));
}
}
} else if (config->forceLoadObjC) {
// we already found that it contains an ObjC symbol. We should also
// consider creating a LazyObjFile class in order to avoid double-loading
// these files here and below (as part of the ArchiveFile).
- if (Optional<MemoryBufferRef> buffer = readFile(path))
- for (const ArchiveMember &member : getArchiveMembers(*buffer))
- if (hasObjCSection(member.mbref))
- inputFiles.push_back(make<ObjFile>(member.mbref, member.modTime));
+ if (Optional<MemoryBufferRef> buffer = readFile(path)) {
+ for (const ArchiveMember &member : getArchiveMembers(*buffer)) {
+ if (hasObjCSection(member.mbref)) {
+ inputFiles.push_back(
+ make<ObjFile>(member.mbref, member.modTime, path));
+ }
+ }
+ }
}
newFile = make<ArchiveFile>(std::move(file));
break;
}
case file_magic::macho_object:
- newFile = make<ObjFile>(mbref, getModTime(path));
+ newFile = make<ObjFile>(mbref, getModTime(path), "");
break;
case file_magic::macho_dynamically_linked_shared_lib:
case file_magic::macho_dynamically_linked_shared_lib_stub:
parseOrderFile(orderFile);
if (config->outputType == MH_EXECUTE && isa<Undefined>(config->entry)) {
- error("undefined symbol: " + config->entry->getName());
+ error("undefined symbol: " + toString(*config->entry));
return false;
}
using namespace lld;
using namespace lld::macho;
+// Returns "<internal>", "foo.a(bar.o)", or "baz.o".
+std::string lld::toString(const InputFile *f) {
+ if (!f)
+ return "<internal>";
+ if (f->archiveName.empty())
+ return std::string(f->getName());
+ return (path::filename(f->archiveName) + "(" + path::filename(f->getName()) +
+ ")")
+ .str();
+}
+
std::vector<InputFile *> macho::inputFiles;
std::unique_ptr<TarWriter> macho::tar;
int InputFile::idCount = 0;
subsections.push_back({{0, isec}});
}
-ObjFile::ObjFile(MemoryBufferRef mb, uint32_t modTime)
+ObjFile::ObjFile(MemoryBufferRef mb, uint32_t modTime, StringRef archiveName)
: InputFile(ObjKind, mb), modTime(modTime) {
+ this->archiveName = std::string(archiveName);
+
auto *buf = reinterpret_cast<const uint8_t *>(mb.getBufferStart());
auto *hdr = reinterpret_cast<const mach_header_64 *>(mb.getBufferStart());
auto *ctx = make<DWARFContext>(
std::move(dObj), "",
- [&](Error err) { warn(getName() + ": " + toString(std::move(err))); },
+ [&](Error err) {
+ warn(toString(this) + ": " + toString(std::move(err)));
+ },
[&](Error warning) {
- warn(getName() + ": " + toString(std::move(warning)));
+ warn(toString(this) + ": " + toString(std::move(warning)));
});
// TODO: Since object files can contain a lot of DWARF info, we should verify
auto *c = reinterpret_cast<const dylib_command *>(cmd);
dylibName = reinterpret_cast<const char *>(cmd) + read32le(&c->dylib.name);
} else {
- error("dylib " + getName() + " missing LC_ID_DYLIB load command");
+ error("dylib " + toString(this) + " missing LC_ID_DYLIB load command");
return;
}
isWeakDef, isTlv));
});
} else {
- error("LC_DYLD_INFO_ONLY not found in " + getName());
+ error("LC_DYLD_INFO_ONLY not found in " + toString(this));
return;
}
"for the member defining symbol " +
toMachOString(sym)));
- auto file = make<ObjFile>(mb, modTime);
- file->archiveName = getName();
+ auto file = make<ObjFile>(mb, modTime, getName());
symbols.insert(symbols.end(), file->symbols.begin(), file->symbols.end());
subsections.insert(subsections.end(), file->subsections.begin(),
: InputFile(BitcodeKind, mbref) {
obj = check(lto::InputFile::create(mbref));
}
-
-// Returns "<internal>" or "baz.o".
-std::string lld::toString(const InputFile *file) {
- return file ? std::string(file->getName()) : "<internal>";
-}
StringRef getName() const { return name; }
MemoryBufferRef mb;
+
std::vector<Symbol *> symbols;
ArrayRef<llvm::MachO::section_64> sectionHeaders;
std::vector<SubsectionMap> subsections;
// Provides an easy way to sort InputFiles deterministically.
const int id;
+ // If not empty, this stores the name of the archive containing this file.
+ // We use this string for creating error messages.
+ std::string archiveName;
+
protected:
InputFile(Kind kind, MemoryBufferRef mb)
: mb(mb), id(idCount++), fileKind(kind), name(mb.getBufferIdentifier()) {}
// .o file
class ObjFile : public InputFile {
public:
- explicit ObjFile(MemoryBufferRef mb, uint32_t modTime);
+ explicit ObjFile(MemoryBufferRef mb, uint32_t modTime, StringRef archiveName);
static bool classof(const InputFile *f) { return f->kind() == ObjKind; }
llvm::DWARFUnit *compileUnit = nullptr;
- StringRef archiveName = "";
const uint32_t modTime;
private:
for (unsigned i = 0; i != maxTasks; ++i)
if (!buf[i].empty())
ret.push_back(
- make<ObjFile>(MemoryBufferRef(buf[i], "lto.tmp"), /*modTime=*/0));
+ make<ObjFile>(MemoryBufferRef(buf[i], "lto.tmp"), /*modTime=*/0, ""));
return ret;
}
if (auto *s = r.referent.dyn_cast<lld::macho::Symbol *>()) {
if (isa<Undefined>(s))
error("undefined symbol " + toString(*s) + ", referenced from " +
- sys::path::filename(isec->file->getName()));
+ toString(isec->file));
else
target->prepareSymbolRelocation(s, isec, r);
} else {
if (ssec->isNeeded())
getOrCreateOutputSegment(ssec->segname)->addOutputSection(ssec);
} else {
- error("section from " + it->second->firstSection()->file->getName() +
+ error("section from " + toString(it->second->firstSection()->file) +
" conflicts with synthetic section " + ssec->segname + "," +
ssec->name);
}
# REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
-# RUN: not %lld -o %t %t.o 2>&1 | FileCheck %s -DBASENAME=%basename_t
-# CHECK: error: undefined symbol _foo, referenced from [[BASENAME]]
+# RUN: rm -rf %t
+# RUN: split-file %s %t
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/main.s -o %t/main.o
+# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %t/foo.s -o %t/foo.o
+# RUN: llvm-ar crs %t/foo.a %t/foo.o
+# RUN: not %lld -o /dev/null %t/main.o 2>&1 | \
+# RUN: FileCheck %s -DSYM=_foo -DFILENAME=%t/main.o
+# RUN: not %lld -o /dev/null %t/main.o %t/foo.a 2>&1 | \
+# RUN: FileCheck %s -DSYM=_bar -DFILENAME='foo.a(foo.o)'
+# RUN: not %lld -o /dev/null %t/main.o -force_load %t/foo.a 2>&1 | \
+# RUN: FileCheck %s -DSYM=_bar -DFILENAME='foo.a(foo.o)'
+# CHECK: error: undefined symbol [[SYM]], referenced from [[FILENAME]]
+#--- foo.s
+.globl _foo
+.text
+_foo:
+ callq _bar
+ retq
+
+#--- main.s
.globl _main
.text
_main: