averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Serialize and honor whether a particular library should be force-loaded.

Browse Source 
When a module built with -autolink-force-load is imported, add a reference
to a special symbol in the corresponding library so that ld is forced to
link it.

This means the library will be linked into the final binary even if no other
symbols are used (which happens for some of our overlays that just add
category methods to Objective-C classes).

Second part of <rdar://problem/16829587>

Swift SVN r17751
This commit is contained in:
Jordan Rose
2014-05-09 01:20:32 +00:00
parent 41700b03da
commit dde2a8b06b
9 changed files with 63 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/Serialization/Serialization.cpp
View File

@@ -424,8 +424,9 @@ static void flattenImportPath(const Module::ImportedModule &import,
}
void Serializer::writeInputFiles(FilenamesTy inputFiles,
StringRef importedHeader,
StringRef moduleLinkName,
StringRef importedHeader) {
bool autolinkForceLoad) {
BCBlockRAII restoreBlock(Out, INPUT_BLOCK_ID, 3);
input_block::SourceFileLayout SourceFile(Out);
input_block::ImportedModuleLayout ImportedModule(Out);
@@ -480,7 +481,7 @@ void Serializer::writeInputFiles(FilenamesTy inputFiles,
if (!moduleLinkName.empty()) {
LinkLibrary.emit(ScratchRecord, serialization::LibraryKind::Library,
moduleLinkName);
autolinkForceLoad, moduleLinkName);
}
}
@@ -2841,9 +2842,9 @@ Serializer::Serializer(const unsigned char (&signature)[N],
void Serializer::writeToStream(raw_ostream &os, ModuleOrSourceFile DC,
const SILModule *SILMod, bool serializeAllSIL,
FilenamesTy inputFiles,
FilenamesTy inputFiles, StringRef importedHeader,
StringRef moduleLinkName,
StringRef importedHeader) {
bool autolinkForceLoad) {
Serializer S{MODULE_SIGNATURE, DC};
// FIXME: This is only really needed for debugging. We don't actually use it.
@@ -2852,7 +2853,8 @@ void Serializer::writeToStream(raw_ostream &os, ModuleOrSourceFile DC,
{
BCBlockRAII moduleBlock(S.Out, MODULE_BLOCK_ID, 2);
S.writeHeader();
S.writeInputFiles(inputFiles, moduleLinkName, importedHeader);
S.writeInputFiles(inputFiles, importedHeader, moduleLinkName,
autolinkForceLoad);
S.writeSIL(SILMod, serializeAllSIL);
S.writeAST(DC);
}
@@ -2883,8 +2885,8 @@ void Serializer::writeDocToStream(raw_ostream &os, ModuleOrSourceFile DC) {
void swift::serialize(ModuleOrSourceFile DC, const char *outputPath,
const char *docOutputPath,
const SILModule *M, bool serializeAllSIL,
FilenamesTy inputFiles, StringRef moduleLinkName,
StringRef importedHeader) {
FilenamesTy inputFiles, StringRef importedHeader,
StringRef moduleLinkName, bool autolinkForceLoad) {
assert(outputPath && outputPath[0] != '\0');
std::string errorInfo;
@@ -2898,7 +2900,7 @@ void swift::serialize(ModuleOrSourceFile DC, const char *outputPath,
}
Serializer::writeToStream(out, DC, M, serializeAllSIL, inputFiles,
moduleLinkName, importedHeader);
importedHeader, moduleLinkName, autolinkForceLoad);
if (docOutputPath && docOutputPath[0] != '\0') {
std::string errorInfo;