-
Notifications
You must be signed in to change notification settings - Fork 15.2k
[lld][elf] Warn if '*' pattern is used multiple times in version scripts #102669
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
igorkudrin
merged 4 commits into
llvm:main
from
igorkudrin:lld-version-scripts-asterisk-pattern-warn
Oct 10, 2024
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e1a204e
[lld][elf] Warn if '*' pattern is used multiple times in version scripts
igorkudrin 20f2710
Fix capitalization
igorkudrin bfd43c4
AsteriskWildcard -> Asterisk, update the comment
igorkudrin 37c1992
Merge branch 'main' into lld-version-scripts-asterisk-pattern-warn
igorkudrin 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -311,13 +311,44 @@ void SymbolTable::scanVersionScript() { | |
|
|
||
| // Then, assign versions to "*". In GNU linkers they have lower priority than | ||
| // other wildcards. | ||
| bool globalAsteriskWildcardFound = false; | ||
| bool localAsteriskWildcardFound = false; | ||
| bool asteriskWildcardReported = false; | ||
| auto assignAsteriskWildcard = [&](SymbolVersion &pat, VersionDefinition *ver, | ||
| bool isLocal) { | ||
| // Avoid issuing a warning if both '--retain-symbol-file' and a version | ||
| // script with `global: *` are used. | ||
| // | ||
| // '--retain-symbol-file' adds a "*" pattern to | ||
| // 'config->versionDefinitions[VER_NDX_LOCAL].nonLocalPatterns', see | ||
| // 'readConfigs()' in 'Driver.cpp'. Note that it is '.nonLocalPatterns', not | ||
| // '.localPatterns', which may seem counterintuitive, but still works as | ||
| // expected. Here we can exploit that and skip analyzing the pattern added | ||
| // for this option. | ||
| if (!asteriskWildcardReported && (isLocal || ver->id > VER_NDX_LOCAL)) { | ||
| if ((isLocal && globalAsteriskWildcardFound) || | ||
| (!isLocal && localAsteriskWildcardFound)) { | ||
| warn("Wildcard pattern '*' is used for both 'local' and 'global' " | ||
|
||
| "scopes in version script"); | ||
| asteriskWildcardReported = true; | ||
| } else if (!isLocal && globalAsteriskWildcardFound) { | ||
| warn("Wildcard pattern '*' is used for multiple version definitions in " | ||
| "version script"); | ||
| asteriskWildcardReported = true; | ||
| } else { | ||
| localAsteriskWildcardFound = isLocal; | ||
| globalAsteriskWildcardFound = !isLocal; | ||
| } | ||
| } | ||
| assignWildcard(pat, isLocal ? VER_NDX_LOCAL : ver->id, ver->name); | ||
igorkudrin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }; | ||
| for (VersionDefinition &v : llvm::reverse(config->versionDefinitions)) { | ||
| for (SymbolVersion &pat : v.nonLocalPatterns) | ||
| if (pat.hasWildcard && pat.name == "*") | ||
| assignWildcard(pat, v.id, v.name); | ||
| assignAsteriskWildcard(pat, &v, false); | ||
| for (SymbolVersion &pat : v.localPatterns) | ||
| if (pat.hasWildcard && pat.name == "*") | ||
| assignWildcard(pat, VER_NDX_LOCAL, v.name); | ||
| assignAsteriskWildcard(pat, &v, true); | ||
| } | ||
|
|
||
| // Symbol themselves might know their versions because symbols | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # REQUIRES: x86 | ||
| # RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o | ||
|
|
||
| # RUN: echo 'foo { *; }; bar { *; };' > %t.ver | ||
| # RUN: ld.lld --version-script %t.ver %t.o -shared -o %t.so 2>&1 | \ | ||
| # RUN: FileCheck --check-prefix=MULTVER %s | ||
|
|
||
| # RUN: echo '{ global: *; local: *;};' > %t.ver | ||
| # RUN: ld.lld --version-script %t.ver %t.o -shared -o %t.so 2>&1 | \ | ||
| # RUN: FileCheck --check-prefix=LOCGLOB %s | ||
|
|
||
| # RUN: echo 'V1 { global: *; }; V2 { local: *;};' > %t.ver | ||
| # RUN: ld.lld --version-script %t.ver %t.o -shared -o %t.so 2>&1 | \ | ||
| # RUN: FileCheck --check-prefix=LOCGLOB %s | ||
|
|
||
| # RUN: echo 'V1 { local: *; }; V2 { global: *;};' > %t.ver | ||
| # RUN: ld.lld --version-script %t.ver %t.o -shared -o %t.so 2>&1 | \ | ||
| # RUN: FileCheck --check-prefix=LOCGLOB %s | ||
|
|
||
| # RUN: echo 'V1 { local: *; }; V2 { local: *;};' > %t.ver | ||
| # RUN: ld.lld --version-script %t.ver %t.o -shared -o %t.so --fatal-warnings | ||
|
|
||
| ## --retain-symbols-file uses the same internal infrastructure as the support | ||
| ## for version scripts. Do not show the warings if they both are used. | ||
| # RUN: echo 'foo' > %t_retain.txt | ||
| # RUN: echo '{ local: *; };' > %t_local.ver | ||
| # RUN: echo '{ global: *; };' > %t_global.ver | ||
| # RUN: ld.lld --retain-symbols-file=%t_retain.txt --version-script %t_local.ver %t.o -shared -o %t.so --fatal-warnings | ||
| # RUN: ld.lld --retain-symbols-file=%t_retain.txt --version-script %t_global.ver %t.o -shared -o %t.so --fatal-warnings | ||
|
|
||
| # MULTVER: warning: Wildcard pattern '*' is used for multiple version definitions in version script | ||
| # LOCGLOB: warning: Wildcard pattern '*' is used for both 'local' and 'global' scopes in version script | ||
|
|
||
| .globl foo | ||
| foo: |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These variables might look mouthful as asterisk is a wildcard character.
Perhaps AsteriskWildcard =>
AsteriskThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done