mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-10 22:35:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

libsanitizer: cherry-pick commit 8f5962b1ccb5fcd4d4544121d43efb860ac3cc6d from upstream

Browse Source 
ASAN: keep support for Global::location

We as GCC still emit __asan_global_source_location for global variables
and we would like to use it in the future. On other hand, we don't
support llvm-symbolizer and the default libbacktraace symbolizer
does not support location info.
This commit is contained in:
Martin Liska 2023-02-24 09:14:40 +01:00
parent 35a067020e
commit cab2636174
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsanitizer/asan/asan_globals.cpp
View File

@ -92,6 +92,10 @@ static void ReportGlobal(const Global &g, const char *prefix) {
if (info.line != 0) {
Report(" location: name=%s, %d\n", info.file, static_cast<int>(info.line));
}
else if (g.gcc_location != 0) {
// Fallback to Global::gcc_location
Report(" location: name=%s, %d\n", g.gcc_location->filename, g.gcc_location->line_no);
}
}
static u32 FindRegistrationSite(const Global *g) {
@ -283,6 +287,11 @@ void PrintGlobalLocation(InternalScopedString *str, const __asan_global &g) {
if (info.line != 0) {
str->append("%s:%d", info.file, static_cast<int>(info.line));
} else if (g.gcc_location != 0) {
// Fallback to Global::gcc_location
str->append("%s", g.gcc_location->filename ? g.gcc_location->filename : g.module_name);
if (g.gcc_location->line_no) str->append(":%d", g.gcc_location->line_no);
if (g.gcc_location->column_no) str->append(":%d", g.gcc_location->column_no);
} else {
str->append("%s", g.module_name);
}

7
libsanitizer/asan/asan_interface_internal.h
View File

@ -53,9 +53,10 @@ extern "C" {
const char *module_name; // Module name as a C string. This pointer is a
// unique identifier of a module.
uptr has_dynamic_init; // Non-zero if the global has dynamic initializer.
uptr windows_padding; // TODO: Figure out how to remove this padding
// that's simply here to make the MSVC incremental
// linker happy...
__asan_global_source_location *gcc_location; // Source location of a global,
// used by GCC compiler. LLVM uses
// llvm-symbolizer that relies
// on DWARF debugging info.
uptr odr_indicator; // The address of the ODR indicator symbol.
};