OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 2
Code Issues Packages Projects Releases Wiki Activity

[lld/mac] Address review feedback and improve a comment 

I forgot to move the message() call around as requested in D103428
before committing that change. Move it now.

Also, improve the ordinal uniq'ing comment. I hadn't realized that the
distinct-but-identical files happen with --reproduce and not in general.

No behavior change.

Differential Revision: https://reviews.llvm.org/D103522
This commit is contained in:
Nico Weber 2021-06-02 09:35:06 -04:00
parent f1a0c5d67c
commit 476e4d65d4
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/MachO/DriverUtils.cpp
View File

@ -214,8 +214,6 @@ DylibFile *macho::loadDylib(MemoryBufferRef mbref, DylibFile *umbrella,
return nullptr; return nullptr;
} }
file = make<DylibFile>(**result, umbrella, isBundleLoader); file = make<DylibFile>(**result, umbrella, isBundleLoader);
if (config->printEachFile)
message(toString(file));
// parseReexports() can recursively call loadDylib(). That's fine since // parseReexports() can recursively call loadDylib(). That's fine since
// we wrote DylibFile we just loaded to the loadDylib cache via the `file` // we wrote DylibFile we just loaded to the loadDylib cache via the `file`
@ -231,8 +229,6 @@ DylibFile *macho::loadDylib(MemoryBufferRef mbref, DylibFile *umbrella,
magic == file_magic::macho_executable || magic == file_magic::macho_executable ||
magic == file_magic::macho_bundle); magic == file_magic::macho_bundle);
file = make<DylibFile>(mbref, umbrella, isBundleLoader); file = make<DylibFile>(mbref, umbrella, isBundleLoader);
if (config->printEachFile)
message(toString(file));
// parseLoadCommands() can also recursively call loadDylib(). See comment // parseLoadCommands() can also recursively call loadDylib(). See comment
// in previous block for why this means we must copy `file` here. // in previous block for why this means we must copy `file` here.

6
lld/MachO/InputFiles.cpp
View File

@ -826,6 +826,9 @@ DylibFile::DylibFile(MemoryBufferRef mb, DylibFile *umbrella,
return; return;
} }
if (config->printEachFile)
message(toString(this));
deadStrippable = hdr->flags & MH_DEAD_STRIPPABLE_DYLIB; deadStrippable = hdr->flags & MH_DEAD_STRIPPABLE_DYLIB;
if (!checkCompatibility(this)) if (!checkCompatibility(this))
@ -900,6 +903,9 @@ DylibFile::DylibFile(const InterfaceFile &interface, DylibFile *umbrella,
compatibilityVersion = interface.getCompatibilityVersion().rawValue(); compatibilityVersion = interface.getCompatibilityVersion().rawValue();
currentVersion = interface.getCurrentVersion().rawValue(); currentVersion = interface.getCurrentVersion().rawValue();
if (config->printEachFile)
message(toString(this));
if (!is_contained(skipPlatformChecks, dylibName) && if (!is_contained(skipPlatformChecks, dylibName) &&
!is_contained(interface.targets(), config->platformInfo.target)) { !is_contained(interface.targets(), config->platformInfo.target)) {
error(toString(this) + " is incompatible with " + error(toString(this) + " is incompatible with " +

14
lld/MachO/Writer.cpp
View File

@ -705,17 +705,21 @@ template <class LP> void Writer::createLoadCommands() {
// Several DylibFiles can have the same installName. Only emit a single // Several DylibFiles can have the same installName. Only emit a single
// load command for that installName and give all these DylibFiles the // load command for that installName and give all these DylibFiles the
// same ordinal. // same ordinal.
// This can happen if: // This can happen in several cases:
// - a new framework could change its installName to an older // - a new framework could change its installName to an older
// framework name via an $ld$ symbol depending on platform_version // framework name via an $ld$ symbol depending on platform_version
// - symlink (eg libpthread.tbd is a symlink to libSystem.tbd) // - symlinks (for example, libpthread.tbd is a symlink to libSystem.tbd;
// Foo.framework/Foo.tbd is usually a symlink to
// Foo.framework/Versions/Current/Foo.tbd, where
// Foo.framework/Versions/Current is usually a symlink to
// Foo.framework/Versions/A)
// - a framework can be linked both explicitly on the linker // - a framework can be linked both explicitly on the linker
// command line and implicitly as a reexport from a different // command line and implicitly as a reexport from a different
// framework. The re-export will usually point to the tbd file // framework. The re-export will usually point to the tbd file
// in Foo.framework/Versions/A/Foo.tbd, while the explicit link will // in Foo.framework/Versions/A/Foo.tbd, while the explicit link will
// usually find Foo.framwork/Foo.tbd. These are usually two identical // usually find Foo.framwork/Foo.tbd. These are usually symlinks,
// but distinct files (concrete example: CFNetwork.framework, reexported // but in a --reproduce archive they will be identical but distinct
// from CoreServices.framework). // files.
// In the first case, *semantically distinct* DylibFiles will have the // In the first case, *semantically distinct* DylibFiles will have the
// same installName. // same installName.
int64_t &ordinal = ordinalForInstallName[dylibFile->dylibName]; int64_t &ordinal = ordinalForInstallName[dylibFile->dylibName];