[Autolink Extract] Filter out common Swift libraries from being linked more than once #59063
Conversation
|
@swift-ci please test |
| // Swift libraries that ususally have autolink directives | ||
| // in most object fiels | ||
| std::unordered_map<std::string, bool> CommonAddedSwiftLibraries = {{"-lswiftSwiftOnoneSupport", false}, | ||
| {"-lswiftCore", false}, |
There was a problem hiding this comment.
Technically, -lswiftCore should be added by the driver (and this tool is only ever invoked by the swift driver) ... so we could even eliminate it entirely.
There was a problem hiding this comment.
I'd like to put this change in a release asap so let's just de-duplicate it for now to be safe and then examine the duplication with the driver, too. Because it'd probably be better to remove this at the place where the directives get inserted, instead of completely removing here.
| @@ -245,7 +275,7 @@ int autolink_extract_main(ArrayRef<const char *> Args, const char *Argv0, | |||
| } | |||
|
|
|||
| if (extractLinkerFlags(BinaryOwner->getBinary(), Instance, BinaryFileName, | |||
| LinkerFlags)) { | |||
| LinkerFlags, CommonAddedSwiftLibraries)) { | |||
There was a problem hiding this comment.
Perhaps it makes sense to sink this entirely into the 3 instances, and use a constexpr as an initializer?
…d more than once A partial solution to swiftlang#58380
artemcm
force-pushed
the
AutoLinkExtractFilterCommon
branch
from
34c1abe to
3d30527
Compare
|
@swift-ci please test |
|
@swift-ci Please Build Toolchain Linux Platform |
A partial solution to #58380
We cannot filter all libraries because duplicate
-lflags have a semantic meaning based on their order, but filtering out just the common Swift libraries should yield a good size improvement already and is safe.