diff options
author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2023-02-13 16:07:47 +0100 |
---|---|---|
committer | Rasmus Villemoes <rv@rasmusvillemoes.dk> | 2023-05-01 10:16:00 +0200 |
commit | 12de8da8961d294904d6af90b9cc27a5ba1ccfd0 (patch) | |
tree | 3168852fd623271d227bc7562ce0ba2ba87cb065 | |
parent | 1ee457a5febc8aa1e21d2298769bc70975f0206f (diff) | |
download | gcc-12de8da8961d294904d6af90b9cc27a5ba1ccfd0.zip gcc-12de8da8961d294904d6af90b9cc27a5ba1ccfd0.tar.gz gcc-12de8da8961d294904d6af90b9cc27a5ba1ccfd0.tar.bz2 |
apply debug-remap to file names in .su files
The .su files generated with -fstack-usage are arguably debug info. In
order to make builds more reproducible, apply the same remapping logic
to the recorded file names as for when producing the debug info
embedded in the object files.
To this end, teach print_decl_identifier() a new
PRINT_DECL_REMAP_DEBUG flag and use that from output_stack_usage_1().
gcc/ChangeLog:
* print-tree.h (PRINT_DECL_REMAP_DEBUG): New flag.
* print-tree.cc (print_decl_identifier): Implement it.
* toplev.cc (output_stack_usage_1): Use it.
-rw-r--r-- | gcc/print-tree.cc | 6 | ||||
-rw-r--r-- | gcc/print-tree.h | 1 | ||||
-rw-r--r-- | gcc/toplev.cc | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/gcc/print-tree.cc b/gcc/print-tree.cc index 1f3afcb..ccecd3d 100644 --- a/gcc/print-tree.cc +++ b/gcc/print-tree.cc @@ -34,6 +34,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-cfg.h" #include "dumpfile.h" #include "print-tree.h" +#include "file-prefix-map.h" /* Define the hash table of nodes already seen. Such nodes are not repeated; brief cross-references are used. */ @@ -1065,7 +1066,10 @@ print_decl_identifier (FILE *file, tree decl, int flags) { expanded_location loc = expand_location (DECL_SOURCE_LOCATION (decl)); - fprintf (file, "%s:%d:%d", loc.file, loc.line, loc.column); + const char *f = flags & PRINT_DECL_REMAP_DEBUG + ? remap_debug_filename (loc.file) + : loc.file; + fprintf (file, "%s:%d:%d", f, loc.line, loc.column); } needs_colon = true; } diff --git a/gcc/print-tree.h b/gcc/print-tree.h index 7683730..dc5a69b 100644 --- a/gcc/print-tree.h +++ b/gcc/print-tree.h @@ -45,6 +45,7 @@ extern void indent_to (FILE *, int); #define PRINT_DECL_ORIGIN 0x1 #define PRINT_DECL_NAME 0x2 #define PRINT_DECL_UNIQUE_NAME 0x4 +#define PRINT_DECL_REMAP_DEBUG 0x8 extern void print_decl_identifier (FILE *, tree, int flags); #endif // GCC_PRINT_TREE_H diff --git a/gcc/toplev.cc b/gcc/toplev.cc index 109c9d5..d53b5e7 100644 --- a/gcc/toplev.cc +++ b/gcc/toplev.cc @@ -829,7 +829,8 @@ output_stack_usage_1 (FILE *cf) if (stack_usage_file) { print_decl_identifier (stack_usage_file, current_function_decl, - PRINT_DECL_ORIGIN | PRINT_DECL_NAME); + PRINT_DECL_ORIGIN | PRINT_DECL_NAME + | PRINT_DECL_REMAP_DEBUG); fprintf (stack_usage_file, "\t" HOST_WIDE_INT_PRINT_DEC"\t%s\n", stack_usage, stack_usage_kind_str[stack_usage_kind]); } |