From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 206ED3858D38; Mon, 27 Feb 2023 08:32:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 206ED3858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1677486751; bh=sdo9OREKHsof1U96JPd3ef/22c4tXxXcWXaf0v2CvZI=; h=From:To:Subject:Date:From; b=F5sNx7rI7tYZMTPeNbl3fp/ADES8VizECScX8bkTKdy+UKVfGAfirxETtv5swBggm 9VgDhduW+Wg59Mum/t3V5esgZ5YsQqj/zNGHPxvy5eHnl13C3vB77+bnRfgz6TqG+P i2OLqfOr7DwK5dzYThsTlXssyif/4F+kZB1KkdVE= 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 r12-9207] asan: adjust module name for global variables X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: cea4b90f8305df681d322315a9c30e3924e1e79d X-Git-Newrev: b8e496d132ec087c9db5951fea23551dcc831d8c Message-Id: <20230227083231.206ED3858D38@sourceware.org> Date: Mon, 27 Feb 2023 08:32:30 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b8e496d132ec087c9db5951fea23551dcc831d8c commit r12-9207-gb8e496d132ec087c9db5951fea23551dcc831d8c Author: Martin Liska Date: Fri Feb 17 15:11:02 2023 +0100 asan: adjust module name for global variables As mentioned in the PR, when we use LTO, we wrongly use ltrans output file name as a module name of a global variable. That leads to a non-reproducible output. After the suggested change, we emit context name of normal global variables. And for artificial variables (like .Lubsan_data3), we use aux_base_name (e.g. "./a.ltrans0.ltrans"). PR sanitizer/108834 gcc/ChangeLog: * asan.cc (asan_add_global): Use proper TU name for normal global variables (and aux_base_name for the artificial one). gcc/testsuite/ChangeLog: * c-c++-common/asan/global-overflow-1.c: Test line and column info for a global variable. (cherry picked from commit 94c9b1bb79f63d000ebb05efc155c149325e332d) Diff: --- gcc/asan.cc | 12 +++++++++++- gcc/testsuite/c-c++-common/asan/global-overflow-1.c | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/asan.cc b/gcc/asan.cc index f0dca99507d..20e5ef9d378 100644 --- a/gcc/asan.cc +++ b/gcc/asan.cc @@ -3246,7 +3246,17 @@ asan_add_global (tree decl, tree type, vec *v) pp_string (&asan_pp, ""); str_cst = asan_pp_string (&asan_pp); - pp_string (&module_name_pp, main_input_filename); + if (!in_lto_p) + pp_string (&module_name_pp, main_input_filename); + else + { + const_tree tu = get_ultimate_context ((const_tree)decl); + if (tu != NULL_TREE) + pp_string (&module_name_pp, IDENTIFIER_POINTER (DECL_NAME (tu))); + else + pp_string (&module_name_pp, aux_base_name); + } + module_name_cst = asan_pp_string (&module_name_pp); if (asan_needs_local_alias (decl)) diff --git a/gcc/testsuite/c-c++-common/asan/global-overflow-1.c b/gcc/testsuite/c-c++-common/asan/global-overflow-1.c index ec412231be0..ad5dbfc649d 100644 --- a/gcc/testsuite/c-c++-common/asan/global-overflow-1.c +++ b/gcc/testsuite/c-c++-common/asan/global-overflow-1.c @@ -26,4 +26,4 @@ int main() { /* { dg-output "READ of size 1 at 0x\[0-9a-f\]+ thread T0.*(\n|\r\n|\r)" } */ /* { dg-output " #0 0x\[0-9a-f\]+ +(in _*main (\[^\n\r]*global-overflow-1.c:20|\[^\n\r]*:0|\[^\n\r]*\\+0x\[0-9a-z\]*)|\[(\])\[^\n\r]*(\n|\r\n|\r).*" } */ /* { dg-output "0x\[0-9a-f\]+ is located 0 bytes to the right of global variable" } */ -/* { dg-output ".*YYY\[^\n\r]* of size 10\[^\n\r]*(\n|\r\n|\r)" } */ +/* { dg-output ".*YYY\[^\n\r]*asan/global-overflow-1.c:15:15'\[^\n\r]*of size 10\[^\n\r]*(\n|\r\n|\r)" } */