From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id EC183385B51F; Fri, 24 Feb 2023 08:20:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC183385B51F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677226841; bh=WnMPIz0xejCt+5DaN+EFOqceyZqZlyQN09C/SlZiOLs=; h=From:To:Subject:Date:From; b=fbG9KYPXpx50fjJxnZqXtGmHtjZ3AcQeygcGQQnKnc5Mtug9lpfSCyEa7K8Q4KsfK /8iQf42GtUaPaN7mtvuUHBADoFRgZvE0GL2J7q6mYdyaxlHbFXSI+VECdoL+3WSINx gXzSY/shvLpapFMy1F0gcVCjqsl0YHQl1XqX2Bjs= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6317] libsanitizer: cherry-pick commit 8f5962b1ccb5fcd4d4544121d43efb860ac3cc6d from upstream X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 35a067020e41d97bc3be15b518b3dc2a64b4aae2 X-Git-Newrev: cab2636174feaec4f12fb8a2d09b1f8dd3bcdf3c Message-Id: <20230224082041.EC183385B51F@sourceware.org> Date: Fri, 24 Feb 2023 08:20:41 +0000 (GMT) List-Id: https://gcc.gnu.org/g:cab2636174feaec4f12fb8a2d09b1f8dd3bcdf3c commit r13-6317-gcab2636174feaec4f12fb8a2d09b1f8dd3bcdf3c Author: Martin Liska Date: Fri Feb 24 09:14:40 2023 +0100 libsanitizer: cherry-pick commit 8f5962b1ccb5fcd4d4544121d43efb860ac3cc6d from upstream 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. Diff: --- libsanitizer/asan/asan_globals.cpp | 9 +++++++++ libsanitizer/asan/asan_interface_internal.h | 7 ++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libsanitizer/asan/asan_globals.cpp b/libsanitizer/asan/asan_globals.cpp index 8f3491f0199..01a243927ca 100644 --- a/libsanitizer/asan/asan_globals.cpp +++ b/libsanitizer/asan/asan_globals.cpp @@ -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(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(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); } diff --git a/libsanitizer/asan/asan_interface_internal.h b/libsanitizer/asan/asan_interface_internal.h index 987f855c0f9..a9982637802 100644 --- a/libsanitizer/asan/asan_interface_internal.h +++ b/libsanitizer/asan/asan_interface_internal.h @@ -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. };