public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Rasmus Villemoes <villemoes@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-382] apply debug-remap to file names in .su files Date: Mon, 1 May 2023 08:16:46 +0000 (GMT) [thread overview] Message-ID: <20230501081646.5521F3858C66@sourceware.org> (raw) https://gcc.gnu.org/g:12de8da8961d294904d6af90b9cc27a5ba1ccfd0 commit r14-382-g12de8da8961d294904d6af90b9cc27a5ba1ccfd0 Author: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Date: Mon Feb 13 16:07:47 2023 +0100 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. Diff: --- gcc/print-tree.cc | 6 +++++- gcc/print-tree.h | 1 + gcc/toplev.cc | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gcc/print-tree.cc b/gcc/print-tree.cc index 1f3afcbbc86..ccecd3dc6a7 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 7683730484f..dc5a69b7a30 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 109c9d58cbd..d53b5e78ae3 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]); }
reply other threads:[~2023-05-01 8:16 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230501081646.5521F3858C66@sourceware.org \ --to=villemoes@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).