[gcc(refs/users/marxin/heads/PR108834-asan-tu-name)] asan: adjust module name for global variables

[gcc(refs/users/marxin/heads/PR108834-asan-tu-name)] asan: adjust module name for global variables

[Martin Liska]

https://gcc.gnu.org/g:c2498e700a5ec63be3d598776365adba16091c47

commit c2498e700a5ec63be3d598776365adba16091c47
Author: Martin Liska <mliska@suse.cz>
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 asan/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.

Diff:
---
 gcc/asan.cc                                         | 7 ++++++-
 gcc/testsuite/c-c++-common/asan/global-overflow-1.c | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/asan.cc b/gcc/asan.cc
index f56d084bc7a..245abb14388 100644
--- a/gcc/asan.cc
+++ b/gcc/asan.cc
@@ -3287,7 +3287,12 @@ asan_add_global (tree decl, tree type, vec<constructor_elt, va_gc> *v)
     pp_string (&asan_pp, "<unknown>");
   str_cst = asan_pp_string (&asan_pp);
 
-  pp_string (&module_name_pp, main_input_filename);
+  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 b97801da2b7..7e167cee67a 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 after 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)" } */

[gcc(refs/users/marxin/heads/PR108834-asan-tu-name)] asan: adjust module name for global variables

[Martin Liska]

https://gcc.gnu.org/g:497459bd12a5327fa9ebcc13027850ac10bd13cb

commit 497459bd12a5327fa9ebcc13027850ac10bd13cb
Author: Martin Liska <mliska@suse.cz>
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 asan/108834
    
    gcc/ChangeLog:
    
            * asan.cc (asan_add_global): Use proper TU name for normal
              global variables (and aux_base_name for the artificial one).

Diff:
---
 gcc/asan.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/asan.cc b/gcc/asan.cc
index f56d084bc7a..245abb14388 100644
--- a/gcc/asan.cc
+++ b/gcc/asan.cc
@@ -3287,7 +3287,12 @@ asan_add_global (tree decl, tree type, vec<constructor_elt, va_gc> *v)
     pp_string (&asan_pp, "<unknown>");
   str_cst = asan_pp_string (&asan_pp);
 
-  pp_string (&module_name_pp, main_input_filename);
+  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))