Skip to content

Commit 027e6e5

Browse files
compnerdcompnerd
committed
AST,DependencyScan,IRGen,Serialization,Tooling: track library style
Track if the dependency is static or dynamic. This is in preparation for helping rename the static library to differentiate it from import libraries.
1 parent 40deafb commit 027e6e5

25 files changed

+139
-93
lines changed

‎include/swift-c/DependencyScan/DependencyScan.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,8 @@ swiftscan_module_info_get_details(swiftscan_dependency_info_t info);
155155
SWIFTSCAN_PUBLIC swiftscan_string_ref_t
156156
swiftscan_link_library_info_get_link_name(
157157
swiftscan_link_library_info_t info);
158+
SWIFTSCAN_PUBLIC bool
159+
swiftscan_link_library_info_get_is_static(swiftscan_link_library_info_t info);
158160
SWIFTSCAN_PUBLIC bool swiftscan_link_library_info_get_is_framework(
159161
swiftscan_link_library_info_t info);
160162
SWIFTSCAN_PUBLIC bool swiftscan_link_library_info_get_should_force_load(

‎include/swift/AST/IRGenOptions.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "llvm/Support/VersionTuple.h"
3434
#include <optional>
3535
#include <string>
36+
#include <tuple>
3637
#include <vector>
3738

3839
namespace swift {
@@ -258,7 +259,7 @@ class IRGenOptions {
258259
SmallVector<LinkLibrary, 4> LinkLibraries;
259260

260261
/// The public dependent libraries specified on the command line.
261-
std::vector<std::string> PublicLinkLibraries;
262+
std::vector<std::tuple<std::string, bool>> PublicLinkLibraries;
262263

263264
/// If non-empty, the (unmangled) name of a dummy symbol to emit that can be
264265
/// used to force-load this module.

‎include/swift/AST/LinkLibrary.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,19 @@ class LinkLibrary {
3232
private:
3333
std::string Name;
3434
unsigned Kind : 1;
35+
unsigned Static : 1;
3536
unsigned ForceLoad : 1;
3637

3738
public:
38-
LinkLibrary(StringRef N, LibraryKind K, bool forceLoad = false)
39-
: Name(N), Kind(static_cast<unsigned>(K)), ForceLoad(forceLoad) {
39+
LinkLibrary(StringRef N, LibraryKind K, bool Static, bool forceLoad = false)
40+
: Name(N), Kind(static_cast<unsigned>(K)), Static(Static),
41+
ForceLoad(forceLoad) {
4042
assert(getKind() == K && "not enough bits for the kind");
4143
}
4244

4345
LibraryKind getKind() const { return static_cast<LibraryKind>(Kind); }
4446
StringRef getName() const { return Name; }
47+
bool isStaticLibrary() const { return Static; }
4548
bool shouldForceLoad() const { return ForceLoad; }
4649
};
4750

‎include/swift/DependencyScan/DependencyScanImpl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ struct swiftscan_dependency_info_s {
6969

7070
struct swiftscan_link_library_info_s {
7171
swiftscan_string_ref_t name;
72+
bool isStatic;
7273
bool isFramework;
7374
bool forceLoad;
7475
};

‎include/swift/DependencyScan/SerializedModuleDependencyCacheFormat.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ using llvm::BCVBR;
4141
const unsigned char MODULE_DEPENDENCY_CACHE_FORMAT_SIGNATURE[] = {'I', 'M', 'D','C'};
4242
const unsigned MODULE_DEPENDENCY_CACHE_FORMAT_VERSION_MAJOR = 9;
4343
/// Increment this on every change.
44-
const unsigned MODULE_DEPENDENCY_CACHE_FORMAT_VERSION_MINOR = 0;
44+
const unsigned MODULE_DEPENDENCY_CACHE_FORMAT_VERSION_MINOR = 1;
4545

4646
/// Various identifiers in this format will rely on having their strings mapped
4747
/// using this ID.
@@ -139,12 +139,12 @@ using IdentifierArrayLayout =
139139
BCRecordLayout<IDENTIFIER_ARRAY_NODE, IdentifierIDArryField>;
140140

141141
// ACTODO: Comment
142-
using LinkLibraryLayout =
143-
BCRecordLayout<LINK_LIBRARY_NODE, // ID
144-
IdentifierIDField, // libraryName
145-
IsFrameworkField, // isFramework
146-
IsForceLoadField // forceLoad
147-
>;
142+
using LinkLibraryLayout = BCRecordLayout<LINK_LIBRARY_NODE, // ID
143+
IdentifierIDField, // libraryName
144+
IsFrameworkField, // isFramework
145+
IsStaticField, // isStatic
146+
IsForceLoadField // forceLoad
147+
>;
148148
// ACTODO: Comment
149149
using LinkLibraryArrayLayout =
150150
BCRecordLayout<LINK_LIBRARY_ARRAY_NODE, IdentifierIDArryField>;

‎include/swift/Frontend/Frontend.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ class CompilerInvocation {
230230
return ClangImporterOpts.ExtraArgs;
231231
}
232232

233-
void addLinkLibrary(StringRef name, LibraryKind kind) {
234-
IRGenOpts.LinkLibraries.push_back({name, kind});
233+
void addLinkLibrary(StringRef name, LibraryKind kind, bool isStaticLibrary) {
234+
IRGenOpts.LinkLibraries.emplace_back(name, kind, isStaticLibrary);
235235
}
236236

237237
ArrayRef<LinkLibrary> getLinkLibraries() const {

‎include/swift/Serialization/SerializationOptions.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
#include <set>
2222
#include <string>
23+
#include <tuple>
2324
#include <vector>
2425

2526
namespace swift {
@@ -147,7 +148,7 @@ class SerializationOptions {
147148
uint64_t getSize() const { return Size; }
148149
};
149150
ArrayRef<FileDependency> Dependencies;
150-
ArrayRef<std::string> PublicDependentLibraries;
151+
ArrayRef<std::tuple<std::string, bool>> PublicDependentLibraries;
151152

152153
bool AutolinkForceLoad = false;
153154
bool SerializeAllSIL = false;

‎lib/AST/ModuleDependencies.cpp

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -490,24 +490,33 @@ swift::dependencies::checkImportNotTautological(const ImportPath::Module moduleP
490490
return false;
491491
}
492492

493-
void
494-
swift::dependencies::registerCxxInteropLibraries(
495-
const llvm::Triple &Target,
496-
StringRef mainModuleName,
497-
bool hasStaticCxx, bool hasStaticCxxStdlib, CXXStdlibKind cxxStdlibKind,
498-
std::function<void(const LinkLibrary&)> RegistrationCallback) {
499-
if (cxxStdlibKind == CXXStdlibKind::Libcxx)
500-
RegistrationCallback(LinkLibrary("c++", LibraryKind::Library));
501-
else if (cxxStdlibKind == CXXStdlibKind::Libstdcxx)
502-
RegistrationCallback(LinkLibrary("stdc++", LibraryKind::Library));
493+
void swift::dependencies::registerCxxInteropLibraries(
494+
const llvm::Triple &Target, StringRef mainModuleName, bool hasStaticCxx,
495+
bool hasStaticCxxStdlib, CXXStdlibKind cxxStdlibKind,
496+
std::function<void(const LinkLibrary &)> RegistrationCallback) {
497+
498+
switch (cxxStdlibKind) {
499+
case CXXStdlibKind::Libcxx:
500+
RegistrationCallback(
501+
LinkLibrary{"c++", LibraryKind::Library, /*static=*/false});
502+
break;
503+
case CXXStdlibKind::Libstdcxx:
504+
RegistrationCallback(
505+
LinkLibrary{"stdc++", LibraryKind::Library, /*static=*/false});
506+
break;
507+
case CXXStdlibKind::Msvcprt:
508+
// FIXME: should we be explicitly linking in msvcprt or will the module do
509+
// so?
510+
break;
511+
case CXXStdlibKind::Unknown:
512+
// FIXME: we should probably emit a warning or a note here.
513+
break;
514+
}
503515

504516
// Do not try to link Cxx with itself.
505-
if (mainModuleName != CXX_MODULE_NAME) {
506-
RegistrationCallback(LinkLibrary(Target.isOSWindows() && hasStaticCxx
507-
? "libswiftCxx"
508-
: "swiftCxx",
509-
LibraryKind::Library));
510-
}
517+
if (mainModuleName != CXX_MODULE_NAME)
518+
RegistrationCallback(
519+
LinkLibrary{"swiftCxx", LibraryKind::Library, hasStaticCxx});
511520

512521
// Do not try to link CxxStdlib with the C++ standard library, Cxx or
513522
// itself.
@@ -516,19 +525,9 @@ swift::dependencies::registerCxxInteropLibraries(
516525
return mainModuleName == Name;
517526
})) {
518527
// Only link with CxxStdlib on platforms where the overlay is available.
519-
switch (Target.getOS()) {
520-
case llvm::Triple::Win32: {
521-
RegistrationCallback(
522-
LinkLibrary(hasStaticCxxStdlib ? "libswiftCxxStdlib" : "swiftCxxStdlib",
523-
LibraryKind::Library));
524-
break;
525-
}
526-
default:
527-
if (Target.isOSDarwin() || Target.isOSLinux())
528-
RegistrationCallback(LinkLibrary("swiftCxxStdlib",
529-
LibraryKind::Library));
530-
break;
531-
}
528+
if (Target.isOSDarwin() || Target.isOSLinux() || Target.isOSWindows())
529+
RegistrationCallback(LinkLibrary{"swiftCxxStdlib", LibraryKind::Library,
530+
hasStaticCxxStdlib});
532531
}
533532
}
534533

‎lib/ClangImporter/ClangImporter.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4078,15 +4078,11 @@ void ClangModuleUnit::collectLinkLibraries(
40784078
if (clangModule->UseExportAsModuleLinkName)
40794079
return;
40804080

4081-
for (auto clangLinkLib : clangModule->LinkLibraries) {
4082-
LibraryKind kind;
4083-
if (clangLinkLib.IsFramework)
4084-
kind = LibraryKind::Framework;
4085-
else
4086-
kind = LibraryKind::Library;
4087-
4088-
callback(LinkLibrary(clangLinkLib.Library, kind));
4089-
}
4081+
for (auto clangLinkLib : clangModule->LinkLibraries)
4082+
callback(LinkLibrary{clangLinkLib.Library,
4083+
clangLinkLib.IsFramework ? LibraryKind::Framework
4084+
: LibraryKind::Library,
4085+
/*static=*/false});
40904086
}
40914087

40924088
StringRef ClangModuleUnit::getFilename() const {

‎lib/ClangImporter/ClangModuleDependencyScanner.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,10 @@ ModuleDependencyVector ClangImporter::bridgeClangModuleDependencies(
266266

267267
std::vector<LinkLibrary> LinkLibraries;
268268
for (const auto &ll : clangModuleDep.LinkLibraries)
269-
LinkLibraries.push_back(
270-
{ll.Library,
271-
ll.IsFramework ? LibraryKind::Framework : LibraryKind::Library});
269+
LinkLibraries.emplace_back(
270+
ll.Library,
271+
ll.IsFramework ? LibraryKind::Framework : LibraryKind::Library,
272+
/*static=*/false);
272273

273274
// Module-level dependencies.
274275
llvm::StringSet<> alreadyAddedModules;

‎lib/DependencyScan/DependencyScanJSON.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,10 @@ void writeLinkLibraries(llvm::raw_ostream &out,
199199
writeJSONValue(out, llInfo.name, indentLevel);
200200
out << ",\n";
201201
out.indent(entryIndentLevel);
202+
out << "\"isStatic\": ";
203+
writeJSONValue(out, llInfo.isStatic, entryIndentLevel);
204+
out << ",\n";
205+
out.indent(entryIndentLevel);
202206
out << "\"isFramework\": ";
203207
writeJSONValue(out, llInfo.isFramework, entryIndentLevel);
204208
out << ",\n";

‎lib/DependencyScan/ModuleDependencyCacheSerialization.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -324,17 +324,18 @@ bool ModuleDependenciesCacheDeserializer::readGraph(
324324

325325
case LINK_LIBRARY_NODE: {
326326
unsigned libraryIdentifierID;
327-
bool isFramework, shouldForceLoad;
327+
bool isFramework, isStatic, shouldForceLoad;
328328
LinkLibraryLayout::readRecord(Scratch, libraryIdentifierID, isFramework,
329-
shouldForceLoad);
329+
isStatic, shouldForceLoad);
330330
auto libraryIdentifier = getIdentifier(libraryIdentifierID);
331331
if (!libraryIdentifier)
332332
llvm::report_fatal_error("Bad link library identifier");
333333

334-
LinkLibraries.push_back(LinkLibrary(libraryIdentifier.value(),
335-
isFramework ? LibraryKind::Framework
336-
: LibraryKind::Library,
337-
shouldForceLoad));
334+
LinkLibraries.emplace_back(
335+
libraryIdentifier.value(),
336+
isFramework ? LibraryKind::Framework
337+
: LibraryKind::Library,
338+
isStatic, shouldForceLoad);
338339
break;
339340
}
340341

@@ -1254,13 +1255,12 @@ void ModuleDependenciesCacheSerializer::writeLinkLibraries(
12541255
unsigned ModuleDependenciesCacheSerializer::writeLinkLibraryInfos(
12551256
const ModuleDependencyInfo &dependencyInfo) {
12561257
using namespace graph_block;
1257-
for (auto &linkLibrary : dependencyInfo.getLinkLibraries()) {
1258+
for (auto &linkLibrary : dependencyInfo.getLinkLibraries())
12581259
LinkLibraryLayout::emitRecord(
12591260
Out, ScratchRecord, AbbrCodes[LinkLibraryLayout::Code],
12601261
getIdentifier(linkLibrary.getName().str()),
12611262
linkLibrary.getKind() == LibraryKind::Framework,
1262-
linkLibrary.shouldForceLoad());
1263-
}
1263+
linkLibrary.isStaticLibrary(), linkLibrary.shouldForceLoad());
12641264
return dependencyInfo.getLinkLibraries().size();
12651265
}
12661266

‎lib/DependencyScan/ScanDependencies.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,7 @@ generateFullDependencyGraph(const CompilerInstance &instance,
812812
const auto &ll = linkLibraries[i];
813813
swiftscan_link_library_info_s *llInfo = new swiftscan_link_library_info_s;
814814
llInfo->name = create_clone(ll.getName().str().c_str());
815+
llInfo->isStatic = ll.isStaticLibrary();
815816
llInfo->isFramework = ll.getKind() == LibraryKind::Framework;
816817
llInfo->forceLoad = ll.shouldForceLoad();
817818
linkLibrarySet->link_libraries[i] = llInfo;
@@ -1257,7 +1258,7 @@ static void resolveImplicitLinkLibraries(const CompilerInstance &instance,
12571258
};
12581259

12591260
if (langOpts.EnableObjCInterop)
1260-
addLinkLibrary({"objc", LibraryKind::Library});
1261+
addLinkLibrary(LinkLibrary{"objc", LibraryKind::Library, /*static=*/false});
12611262

12621263
if (langOpts.EnableCXXInterop) {
12631264
auto OptionalCxxDep = cache.findDependency(CXX_MODULE_NAME);

‎lib/Frontend/CompilerInvocation.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3211,7 +3211,8 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
32113211
llvm_unreachable("Unknown LinkLibrary option kind");
32123212
}
32133213

3214-
Opts.LinkLibraries.push_back(LinkLibrary(A->getValue(), Kind));
3214+
Opts.LinkLibraries.emplace_back(
3215+
A->getValue(), Kind, /*static=*/false);
32153216
}
32163217

32173218
if (auto valueNames = Args.getLastArg(OPT_disable_llvm_value_names,
@@ -3441,11 +3442,11 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
34413442
}
34423443

34433444
for (const auto &Lib : Args.getAllArgValues(options::OPT_autolink_library))
3444-
Opts.LinkLibraries.push_back(LinkLibrary(Lib, LibraryKind::Library));
3445+
Opts.LinkLibraries.emplace_back(
3446+
Lib, LibraryKind::Library, /*static=*/false);
34453447

3446-
for (const auto &Lib : Args.getAllArgValues(options::OPT_public_autolink_library)) {
3447-
Opts.PublicLinkLibraries.push_back(Lib);
3448-
}
3448+
for (const auto &Lib : Args.getAllArgValues(options::OPT_public_autolink_library))
3449+
Opts.PublicLinkLibraries.push_back(std::make_tuple(Lib, /*static=*/false));
34493450

34503451
if (const Arg *A = Args.getLastArg(OPT_type_info_dump_filter_EQ)) {
34513452
StringRef mode(A->getValue());

‎lib/IRGen/IRGenModule.cpp

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,32 +1581,35 @@ swift::irgen::encodeForceLoadSymbolName(llvm::SmallVectorImpl<char> &buf,
15811581
}
15821582

15831583
llvm::SmallString<32> getTargetDependentLibraryOption(const llvm::Triple &T,
1584-
StringRef library) {
1584+
LinkLibrary library) {
15851585
llvm::SmallString<32> buffer;
1586+
StringRef name = library.getName();
15861587

15871588
if (T.isWindowsMSVCEnvironment() || T.isWindowsItaniumEnvironment()) {
1588-
bool quote = library.contains(' ');
1589+
bool quote = name.contains(' ');
15891590

15901591
buffer += "/DEFAULTLIB:";
15911592
if (quote)
15921593
buffer += '"';
1593-
buffer += library;
1594-
if (!library.ends_with_insensitive(".lib"))
1594+
if (library.isStaticLibrary() && !name.starts_with_insensitive("lib"))
1595+
buffer += "lib";
1596+
buffer += name;
1597+
if (!name.ends_with_insensitive(".lib"))
15951598
buffer += ".lib";
15961599
if (quote)
15971600
buffer += '"';
15981601
} else if (T.isPS4()) {
1599-
bool quote = library.contains(' ');
1602+
bool quote = name.contains(' ');
16001603

16011604
buffer += "\01";
16021605
if (quote)
16031606
buffer += '"';
1604-
buffer += library;
1607+
buffer += name;
16051608
if (quote)
16061609
buffer += '"';
16071610
} else {
16081611
buffer += "-l";
1609-
buffer += library;
1612+
buffer += name;
16101613
}
16111614

16121615
return buffer;
@@ -1686,7 +1689,8 @@ void IRGenModule::addLinkLibraries() {
16861689
});
16871690

16881691
if (ObjCInterop)
1689-
registerLinkLibrary(LinkLibrary("objc", LibraryKind::Library));
1692+
registerLinkLibrary(
1693+
LinkLibrary{"objc", LibraryKind::Library, /*static=*/false});
16901694

16911695
// If C++ interop is enabled, add -lc++ on Darwin and -lstdc++ on linux.
16921696
// Also link with C++ bridging utility module (Cxx) and C++ stdlib overlay
@@ -1817,7 +1821,7 @@ void AutolinkKind::collectEntriesFromLibraries(
18171821
switch (linkLib.getKind()) {
18181822
case LibraryKind::Library: {
18191823
llvm::SmallString<32> opt =
1820-
getTargetDependentLibraryOption(IGM.Triple, linkLib.getName());
1824+
getTargetDependentLibraryOption(IGM.Triple, linkLib);
18211825
Entries.insert(llvm::MDNode::get(ctx, llvm::MDString::get(ctx, opt)));
18221826
continue;
18231827
}
@@ -1838,7 +1842,7 @@ void AutolinkKind::collectEntriesFromLibraries(
18381842
switch (linkLib.getKind()) {
18391843
case LibraryKind::Library: {
18401844
llvm::SmallString<32> opt =
1841-
getTargetDependentLibraryOption(IGM.Triple, linkLib.getName());
1845+
getTargetDependentLibraryOption(IGM.Triple, linkLib);
18421846
Entries.insert(llvm::MDNode::get(ctx, llvm::MDString::get(ctx, opt)));
18431847
continue;
18441848
}

‎lib/Immediate/Immediate.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ static void addMergedLibraries(SmallVectorImpl<LinkLibrary> &AllLinkLibraries,
231231
}
232232

233233
for (StringRef NewLib : NewLibs)
234-
AllLinkLibraries.push_back(LinkLibrary(NewLib, LibraryKind::Library));
234+
AllLinkLibraries.emplace_back(
235+
NewLib, LibraryKind::Library, /*static=*/false);
235236
}
236237

237238
bool swift::immediate::autolinkImportedModules(ModuleDecl *M,

0 commit comments

Comments
 (0)