diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2021-12-30 11:36:52 -0500 |
|---|---|---|
| committer | Jeff Law <jeffreyalaw@gmail.com> | 2021-12-30 11:36:52 -0500 |
| commit | be674bdd11d5fa6b20d469e6d6f43c26da9e744f (patch) | |
| tree | 277642578bf615918d0bf059157187721d18e48a /libiberty | |
| parent | 52441f18db7e051c16f2e6e12f415b93cb5450c4 (diff) | |
libiberty: support digits in cpp mangled clone names
Currently libiberty fails to demangle the name of cloned functions if
the clone-type-identifier contains numbers.
This can be observed with the following example:
$ cat > ex.cc <<EOT
void foo (float *, float *)
__attribute__((target_clones("avx2,avx,sse4.1,default")));
void foo (float *, float *) {}
EOT
$ gcc -c ex.cc
$ nm -C ex.o | grep foo
0000000000000000 i foo(float*, float*)
0000000000000026 t foo(float*, float*) [clone .avx.1]
0000000000000013 t _Z3fooPfS_.avx2.0
0000000000000000 t foo(float*, float*) [clone .default.3]
0000000000000000 W foo(float*, float*) [clone .resolver]
0000000000000039 t _Z3fooPfS_.sse4_1.2
In this example, gcc creates clones for the FOO function, each matching
one of the specified targets. When inspecting the binary, nm (and other
libiberty-based tools, including gdb) fails to demangle the symbol names
if the clone identifier contains numbers.
Form my understanding of the mangling convention[1], clone names are
part of vendor-specific suffixes and do not have rule preventing them
from containing digits.
This commit proposes to fix the demangling. With this commit (ported to
binutils), nm gives the following output:
$ nm-new -C ex.o | grep foo
0000000000000000 i foo(float*, float*)
0000000000000026 t foo(float*, float*) [clone .avx.1]
0000000000000013 t foo(float*, float*) [clone .avx2.0]
0000000000000000 t foo(float*, float*) [clone .default.3]
0000000000000000 W foo(float*, float*) [clone .resolver]
0000000000000039 t foo(float*, float*) [clone .sse4_1.2]
Tested on x86_86-linux with 'make check-libiberty'.
[1] https://itanium-cxx-abi.github.io/cxx-abi/abi.html#mangling
libiberty/ChangeLog:
* cp-demangle.c (d_clone_suffix): Support digits in clone tag
names.
* testsuite/demangle-expected: Check demangling of clone symbols
with digits in name.
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/cp-demangle.c | 5 | ||||
| -rw-r--r-- | libiberty/testsuite/demangle-expected | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c index 33490f60285..fb576cb4c97 100644 --- a/libiberty/cp-demangle.c +++ b/libiberty/cp-demangle.c @@ -3884,10 +3884,11 @@ d_clone_suffix (struct d_info *di, struct demangle_component *encoding) const char *pend = suffix; struct demangle_component *n; - if (*pend == '.' && (IS_LOWER (pend[1]) || pend[1] == '_')) + if (*pend == '.' && (IS_LOWER (pend[1]) || IS_DIGIT (pend[1]) + || pend[1] == '_')) { pend += 2; - while (IS_LOWER (*pend) || *pend == '_') + while (IS_LOWER (*pend) || IS_DIGIT (*pend) || *pend == '_') ++pend; } while (*pend == '.' && IS_DIGIT (pend[1])) diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected index 19a0d621bc0..de54ad73cc8 100644 --- a/libiberty/testsuite/demangle-expected +++ b/libiberty/testsuite/demangle-expected @@ -1164,6 +1164,11 @@ foo(int) [clone ._omp_cpyfn.6] foo # --format=gnu-v3 --no-params +_Z3fooPfS_S_j.sse4_1.2 +foo(float*, float*, float*, unsigned int) [clone .sse4_1.2] +foo +# +--format=gnu-v3 --no-params _Z1fIKFvvES0_Evv void f<void () const, void () const>() f<void () const, void () const> |