Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf revert from Ingo Molnar:
"This fixes the 'perf top' regression Markus Trippelsdorf reported"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Revert "perf symbols: Demangle cloned functions"
+1
-26
+1
-26
tools/perf/util/symbol-elf.c
+1
-26
tools/perf/util/symbol-elf.c
···
928
928
* to it...
929
929
*/
930
930
if (symbol_conf.demangle) {
931
-
/*
932
-
* The demangler doesn't deal with cloned functions.
933
-
* XXXX.clone.NUM or similar
934
-
* Strip the dot part and readd it later.
935
-
*/
936
-
char *p = (char *)elf_name, *dot;
937
-
dot = strchr(elf_name, '.');
938
-
if (dot) {
939
-
p = strdup(elf_name);
940
-
if (!p)
941
-
goto new_symbol;
942
-
dot = strchr(p, '.');
943
-
*dot = 0;
944
-
}
945
-
946
-
demangled = bfd_demangle(NULL, p,
931
+
demangled = bfd_demangle(NULL, elf_name,
947
932
DMGL_PARAMS | DMGL_ANSI);
948
-
if (dot)
949
-
*dot = '.';
950
-
if (demangled && dot) {
951
-
demangled = realloc(demangled, strlen(demangled) + strlen(dot) + 1);
952
-
if (!demangled)
953
-
goto new_symbol;
954
-
strcpy(demangled + (dot - p), dot);
955
-
}
956
-
if (p != elf_name)
957
-
free(p);
958
933
if (demangled != NULL)
959
934
elf_name = demangled;
960
935
}