Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions lld/ELF/SymbolTable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,13 +311,44 @@ void SymbolTable::scanVersionScript() {

// Then, assign versions to "*". In GNU linkers they have lower priority than
// other wildcards.
bool globalAsteriskWildcardFound = false;
Copy link
Member

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 => Asterisk

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

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);
};
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
Expand Down
4 changes: 3 additions & 1 deletion lld/test/ELF/version-script-reassign-glob.s
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
# RUN: llvm-readelf --dyn-syms %t.so | FileCheck --check-prefix=BAR %s

# RUN: echo 'bar1 { *; }; bar2 { *; };' > %t2.ver
# RUN: ld.lld --version-script %t2.ver %t.o -shared -o %t2.so --fatal-warnings
# RUN: ld.lld --version-script %t2.ver %t.o -shared -o %t2.so 2>&1 | \
# RUN: FileCheck --check-prefix=DUPWARN %s
# RUN: llvm-readelf --dyn-syms %t2.so | FileCheck --check-prefix=BAR2 %s

## If both a non-* glob and a * match, non-* wins.
Expand All @@ -21,6 +22,7 @@

## When there are multiple * patterns, the last wins.
# BAR2: GLOBAL DEFAULT 7 foo@@bar2
# DUPWARN: warning: wildcard pattern '*' is used for multiple version definitions in version script

.globl foo
foo:
35 changes: 35 additions & 0 deletions lld/test/ELF/version-script-warn.s
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: