diff --git a/lld/MachO/Driver.cpp b/lld/MachO/Driver.cpp --- a/lld/MachO/Driver.cpp +++ b/lld/MachO/Driver.cpp @@ -263,7 +263,7 @@ static InputFile *addFile(StringRef path, bool forceLoadArchive, bool isBundleLoader = false) { - Optional buffer = readLinkableFile(path); + Optional buffer = readFile(path); if (!buffer) return nullptr; MemoryBufferRef mbref = *buffer; @@ -279,7 +279,7 @@ error(path + ": archive has no index; run ranlib to add one"); if (config->allLoad || forceLoadArchive) { - if (Optional buffer = readLinkableFile(path)) { + if (Optional buffer = readFile(path)) { for (const ArchiveMember &member : getArchiveMembers(*buffer)) { if (Optional file = loadArchiveMember( member.mbref, member.modTime, path, /*objCOnly=*/false)) { @@ -300,7 +300,7 @@ // 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 buffer = readLinkableFile(path)) { + if (Optional buffer = readFile(path)) { for (const ArchiveMember &member : getArchiveMembers(*buffer)) { if (Optional file = loadArchiveMember( member.mbref, member.modTime, path, /*objCOnly=*/true)) { @@ -403,7 +403,7 @@ } static void addFileList(StringRef path) { - Optional buffer = readRawFile(path); + Optional buffer = readFile(path); if (!buffer) return; MemoryBufferRef mbref = *buffer; @@ -426,7 +426,7 @@ // // The file can also have line comments that start with '#'. static void parseOrderFile(StringRef path) { - Optional buffer = readRawFile(path); + Optional buffer = readFile(path); if (!buffer) { error("Could not read order file at " + path); return; @@ -940,7 +940,7 @@ StringRef segName = arg->getValue(0); StringRef sectName = arg->getValue(1); StringRef fileName = arg->getValue(2); - Optional buffer = readRawFile(fileName); + Optional buffer = readFile(fileName); if (buffer) inputFiles.insert(make(*buffer, segName, sectName)); } diff --git a/lld/MachO/DriverUtils.cpp b/lld/MachO/DriverUtils.cpp --- a/lld/MachO/DriverUtils.cpp +++ b/lld/MachO/DriverUtils.cpp @@ -132,7 +132,7 @@ os << "-o " << quote(path::filename(arg->getValue())) << "\n"; break; case OPT_filelist: - if (Optional buffer = readRawFile(arg->getValue())) + if (Optional buffer = readFile(arg->getValue())) for (StringRef path : args::getLines(*buffer)) os << quote(rewritePath(path)) << "\n"; break; diff --git a/lld/MachO/InputFiles.h b/lld/MachO/InputFiles.h --- a/lld/MachO/InputFiles.h +++ b/lld/MachO/InputFiles.h @@ -173,8 +173,7 @@ extern llvm::SetVector inputFiles; -llvm::Optional readRawFile(StringRef path); -llvm::Optional readLinkableFile(StringRef path); +llvm::Optional readFile(StringRef path); const llvm::MachO::load_command * findCommand(const llvm::MachO::mach_header_64 *, uint32_t type); diff --git a/lld/MachO/InputFiles.cpp b/lld/MachO/InputFiles.cpp --- a/lld/MachO/InputFiles.cpp +++ b/lld/MachO/InputFiles.cpp @@ -91,8 +91,7 @@ int InputFile::idCount = 0; // Open a given file path and return it as a memory-mapped file. -// Perform no sanity checks--just open, map & return. -Optional macho::readRawFile(StringRef path) { +Optional macho::readFile(StringRef path) { // Open a file. auto mbOrErr = MemoryBuffer::getFile(path); if (auto ec = mbOrErr.getError()) { @@ -103,32 +102,12 @@ std::unique_ptr &mb = *mbOrErr; MemoryBufferRef mbref = mb->getMemBufferRef(); make>(std::move(mb)); // take mb ownership - return mbref; -} - -// Open a given file path and return it as a memory-mapped file. -// Assume the file has one of a variety of linkable formats and -// perform some basic sanity checks, notably minimum length. -Optional macho::readLinkableFile(StringRef path) { - Optional maybeMbref = readRawFile(path); - if (!maybeMbref) { - return None; - } - MemoryBufferRef mbref = *maybeMbref; - - // LD64 hard-codes 20 as minimum header size, which is presumably - // the smallest header among the the various linkable input formats - // LLD are less demanding. We insist on having only enough data for - // a magic number. - if (mbref.getBufferSize() < sizeof(uint32_t)) { - error("file is too small to contain a magic number: " + path); - return None; - } // If this is a regular non-fat file, return it. const char *buf = mbref.getBufferStart(); auto *hdr = reinterpret_cast(buf); - if (read32be(&hdr->magic) != MachO::FAT_MAGIC) { + if (mbref.getBufferSize() < sizeof(uint32_t) || + read32be(&hdr->magic) != MachO::FAT_MAGIC) { if (tar) tar->append(relativeToRoot(path), mbref.getBuffer()); return mbref; @@ -565,7 +544,7 @@ // The path can point to either a dylib or a .tbd file. static Optional loadDylib(StringRef path, DylibFile *umbrella) { - Optional mbref = readLinkableFile(path); + Optional mbref = readFile(path); if (!mbref) { error("could not read dylib file at " + path); return {}; diff --git a/lld/test/MachO/invalid/tiny-input.s b/lld/test/MachO/invalid/tiny-input.s deleted file mode 100644 --- a/lld/test/MachO/invalid/tiny-input.s +++ /dev/null @@ -1,18 +0,0 @@ -# REQUIRES: x86 - -## Check that files too short to have a magic number are rejected as inputs -# RUN: echo -n 1 >%t-1.o -# RUN: echo -n 12 >%t-2.o -# RUN: echo -n 123 >%t-3.o -# RUN: echo -n 1234 >%t-4.o -# RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o -# RUN: not %lld -o %t %t.o %t-1.o %t-2.o %t-3.o %t-4.o 2>&1 | FileCheck %s - -# CHECK: error: file is too small to contain a magic number: {{.*}}-1.o -# CHECK: error: file is too small to contain a magic number: {{.*}}-2.o -# CHECK: error: file is too small to contain a magic number: {{.*}}-3.o -# CHECK: error: {{.*}}-4.o: unhandled file type - -.global _main -_main: - ret diff --git a/lld/test/MachO/rename.s b/lld/test/MachO/rename.s --- a/lld/test/MachO/rename.s +++ b/lld/test/MachO/rename.s @@ -14,7 +14,7 @@ # BAD1-DAG: error: invalid name for segment or section: S/ASHY_SEG # BAD1-DAG: error: invalid name for segment or section: st*rry_sect # BAD1-DAG: error: invalid name for segment or section: -o -# BAD1-DAG: error: file is too small to contain a magic number: +# BAD1-DAG: error: {{.*}}: unhandled file type # RUN: not %lld \ # RUN: -rename_segment H#SHY_SEG PL+SSY_SEG \ @@ -24,7 +24,7 @@ # BAD2-DAG: error: invalid name for segment or section: H#SHY_SEG # BAD2-DAG: error: invalid name for segment or section: PL+SSY_SEG # BAD2-DAG: error: invalid name for segment or section: -o -# BAD2-DAG: error: file is too small to contain a magic number: +# BAD2-DAG: error: {{.*}}: unhandled file type ## Check that section and segment renames happen # RUN: %lld \