public inbox for gcc-bugs@sourceware.org help / color / mirror / Atom feed
From: "vries at gcc dot gnu.org" <gcc-bugzilla@gcc.gnu.org> To: gcc-bugs@gcc.gnu.org Subject: [Bug debug/115066] [debug, gsplit-dwarf, gdwarf-4, g3] DW_MACRO_define_strp used for debug_str_offsets index Date: Mon, 13 May 2024 11:11:00 +0000 [thread overview] Message-ID: <bug-115066-4-p7o1FIyIzk@http.gcc.gnu.org/bugzilla/> (raw) In-Reply-To: <bug-115066-4@http.gcc.gnu.org/bugzilla/> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115066 --- Comment #6 from Tom de Vries <vries at gcc dot gnu.org> --- (In reply to Jakub Jelinek from comment #5) > Just make it if (dwarf_split_debug_info) then? That works as well indeed: ... diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index eedb13bb069..70b7f5f42cd 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -29045,7 +29045,7 @@ output_macinfo_op (macinfo_entry *ref) && !DWARF2_INDIRECT_STRING_SUPPORT_MISSING_ON_TARGET && (debug_str_section->common.flags & SECTION_MERGE) != 0) { - if (dwarf_split_debug_info && dwarf_version >= 5) + if (dwarf_split_debug_info) ref->code = ref->code == DW_MACINFO_define ? DW_MACRO_define_strx : DW_MACRO_undef_strx; else @@ -29097,12 +29097,20 @@ output_macinfo_op (macinfo_entry *ref) HOST_WIDE_INT_PRINT_UNSIGNED, ref->lineno); if (node->form == DW_FORM_strp) - dw2_asm_output_offset (dwarf_offset_size, node->label, - debug_str_section, "The macro: \"%s\"", - ref->info); + { + gcc_assert (ref->code == DW_MACRO_define_strp + || ref->code == DW_MACRO_undef_strp); + dw2_asm_output_offset (dwarf_offset_size, node->label, + debug_str_section, "The macro: \"%s\"", + ref->info); + } else - dw2_asm_output_data_uleb128 (node->index, "The macro: \"%s\"", - ref->info); + { + gcc_assert (ref->code == DW_MACRO_define_strx + || ref->code == DW_MACRO_undef_strx); + dw2_asm_output_data_uleb128 (node->index, "The macro: \"%s\"", + ref->info); + } break; case DW_MACRO_import: dw2_asm_output_data (1, ref->code, "Import"); ... I've also added asserts detecting this PR.
next prev parent reply other threads:[~2024-05-13 11:11 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-05-13 8:40 [Bug debug/115066] New: " vries at gcc dot gnu.org 2024-05-13 8:42 ` [Bug debug/115066] " vries at gcc dot gnu.org 2024-05-13 9:12 ` vries at gcc dot gnu.org 2024-05-13 10:27 ` rguenth at gcc dot gnu.org 2024-05-13 10:29 ` vries at gcc dot gnu.org 2024-05-13 10:33 ` jakub at gcc dot gnu.org 2024-05-13 11:11 ` vries at gcc dot gnu.org [this message] 2024-05-14 11:35 ` vries at gcc dot gnu.org 2024-05-14 12:00 ` cvs-commit at gcc dot gnu.org 2024-05-14 12:04 ` vries at gcc dot gnu.org 2024-05-16 8:35 ` ro at gcc dot gnu.org 2024-05-16 9:06 ` vries at gcc dot gnu.org 2024-05-16 9:22 ` ro at CeBiTec dot Uni-Bielefeld.DE 2024-05-22 8:06 ` cvs-commit at gcc dot gnu.org 2024-05-27 14:02 ` clyon at gcc dot gnu.org
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=bug-115066-4-p7o1FIyIzk@http.gcc.gnu.org/bugzilla/ \ --to=gcc-bugzilla@gcc.gnu.org \ --cc=gcc-bugs@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).