diff options
| -rw-r--r-- | lib/msan/msan_report.cc | 4 | ||||
| -rw-r--r-- | test/msan/report-demangling.cc | 19 |
2 files changed, 21 insertions, 2 deletions
diff --git a/lib/msan/msan_report.cc b/lib/msan/msan_report.cc index 85e61e214..28dce8526 100644 --- a/lib/msan/msan_report.cc +++ b/lib/msan/msan_report.cc @@ -46,8 +46,8 @@ static void DescribeStackOrigin(const char *so, uptr pc) { Printf( " %sUninitialized value was created by an allocation of '%s%s%s'" " in the stack frame of function '%s%s%s'%s\n", - d.Origin(), d.Name(), s, d.Origin(), d.Name(), - Symbolizer::Get()->Demangle(sep + 1), d.Origin(), d.End()); + d.Origin(), d.Name(), s, d.Origin(), d.Name(), sep + 1, d.Origin(), + d.End()); InternalFree(s); if (pc) { diff --git a/test/msan/report-demangling.cc b/test/msan/report-demangling.cc new file mode 100644 index 000000000..e6d5c27ec --- /dev/null +++ b/test/msan/report-demangling.cc @@ -0,0 +1,19 @@ +// Test that function name is mangled in the "created by an allocation" line, +// and demangled in the single-frame "stack trace" that follows. + +// RUN: %clangxx_msan -fsanitize-memory-track-origins -m64 -O0 %s -o %t && not %run %t >%t.out 2>&1 +// RUN: FileCheck %s < %t.out && FileCheck %s < %t.out + +__attribute__((noinline)) +int f() { + int x; + int *volatile p = &x; + return *p; +} + +int main(int argc, char **argv) { + return f(); + // CHECK: WARNING: MemorySanitizer: use-of-uninitialized-value + // CHECK: Uninitialized value was created by an allocation of 'x' in the stack frame of function '_Z1fv' + // CHECK: #0 {{.*}} in f() {{.*}}report-demangling.cc:[[@LINE-10]] +} |