-
Notifications
You must be signed in to change notification settings - Fork 10.5k
AST/IRGen: Accept @_weakLinked
on import decls to force weak linkage of symbols from a module
#60414
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
AST/IRGen: Accept @_weakLinked
on import decls to force weak linkage of symbols from a module
#60414
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bc5f13c
AST: Accept `@_weakLinked` on import decls to force weak linkage of s…
tshortli f71a323
IRGen: Use extern_weak linkage for Clang symbols from @_weakLinked im…
tshortli b58c59b
NFC: Update weaklinked_import.swift to reflect that @_weakLinked is u…
tshortli fb411c8
NFC: Add tests verifying that @_weakLinked import is not transitive.
tshortli 1778a76
NFC: Add a short test case demonstrating that inlining currently bypa…
tshortli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2574,6 +2574,25 @@ bool SourceFile::isImportedAsSPI(const ValueDecl *targetDecl) const { | |
return false; | ||
} | ||
|
||
bool SourceFile::importsModuleAsWeakLinked(const ModuleDecl *module) const { | ||
for (auto &import : *Imports) { | ||
if (!import.options.contains(ImportFlags::WeakLinked)) | ||
continue; | ||
|
||
const ModuleDecl *importedModule = import.module.importedModule; | ||
if (module == importedModule) | ||
return true; | ||
|
||
// Also check whether the target module is actually the underlyingClang | ||
// module for this @_weakLinked import. | ||
nkcsgexi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
const ModuleDecl *clangModule = | ||
importedModule->getUnderlyingModuleIfOverlay(); | ||
if (module == clangModule) | ||
return true; | ||
} | ||
return false; | ||
} | ||
|
||
bool ModuleDecl::isImportedAsSPI(const SpecializeAttr *attr, | ||
const ValueDecl *targetDecl) const { | ||
auto targetModule = targetDecl->getModuleContext(); | ||
|
@@ -2599,6 +2618,15 @@ bool ModuleDecl::isImportedAsSPI(Identifier spiGroup, | |
return importedSPIGroups.count(spiGroup); | ||
} | ||
|
||
bool ModuleDecl::isImportedAsWeakLinked(const Decl *targetDecl) const { | ||
const auto *declaringModule = targetDecl->getModuleContext(); | ||
for (auto file : getFiles()) { | ||
if (file->importsModuleAsWeakLinked(declaringModule)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we diagnose some source files use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, I'm planning to do that in an upcoming PR. |
||
return true; | ||
} | ||
return false; | ||
} | ||
|
||
bool Decl::isSPI() const { | ||
return !getSPIGroups().empty(); | ||
} | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.