public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Thomas Schwinge <tschwinge@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] dwarf2out.c: Don't emit DW_LANG_Rust_old Date: Wed, 16 Nov 2022 11:49:36 +0000 (GMT) [thread overview] Message-ID: <20221116114936.A1B6A3959C95@sourceware.org> (raw) https://gcc.gnu.org/g:cdcfe27cfba23402f91200c64c1ef8e0bf3528a0 commit cdcfe27cfba23402f91200c64c1ef8e0bf3528a0 Author: Mark Wielaard <mark@klomp.org> Date: Sun Oct 30 16:03:16 2022 +0100 dwarf2out.c: Don't emit DW_LANG_Rust_old DW_LANG_Rust_old is a non-standard DWARF language code used by old rustc compilers before DWARF5 (released in 2017). Just always emit DW_LANG_Rust unless producing strict DWARF for versions before 5. And in that old strict DWARF case just emit DW_LANG_C instead of a non-standard language code. Diff: --- gcc/dwarf2out.cc | 14 +++++--------- gcc/testsuite/rust/debug/oldlang.rs | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index 7b9d5ae33fc..87c0d103a27 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -5600,14 +5600,15 @@ is_fortran (const_tree decl) return is_fortran (); } -/* Return TRUE if the language is Rust. */ +/* Return TRUE if the language is Rust. + Note, returns FALSE for dwarf_version < 5 && dwarf_strict. */ static inline bool is_rust () { unsigned int lang = get_AT_unsigned (comp_unit_die (), DW_AT_language); - return lang == DW_LANG_Rust || lang == DW_LANG_Rust_old; + return lang == DW_LANG_Rust; } /* Return TRUE if the language is Ada. */ @@ -25216,13 +25217,6 @@ gen_compile_unit_die (const char *filename) } else if (strcmp (language_string, "GNU F77") == 0) language = DW_LANG_Fortran77; - else if (strcmp (language_string, "GNU Rust") == 0) - { - if (dwarf_version >= 5 || !dwarf_strict) - language = DW_LANG_Rust; - else - language = DW_LANG_Rust_old; - } else if (dwarf_version >= 3 || !dwarf_strict) { if (strcmp (language_string, "GNU Ada") == 0) @@ -25248,6 +25242,8 @@ gen_compile_unit_die (const char *filename) { if (strcmp (language_string, "GNU Go") == 0) language = DW_LANG_Go; + else if (strcmp (language_string, "GNU Rust") == 0) + language = DW_LANG_Rust; } } /* Use a degraded Fortran setting in strict DWARF2 so is_fortran works. */ diff --git a/gcc/testsuite/rust/debug/oldlang.rs b/gcc/testsuite/rust/debug/oldlang.rs index ddacf0e4392..648d6b78f06 100644 --- a/gcc/testsuite/rust/debug/oldlang.rs +++ b/gcc/testsuite/rust/debug/oldlang.rs @@ -1,6 +1,6 @@ fn main () { // { dg-do compile } // { dg-options "-gstrict-dwarf -gdwarf-3 -dA" } -// DW_LANG_Rust_old is 0x9000 -// { dg-final { scan-assembler "0x9000\[ \t]\[^\n\r]* DW_AT_language" } } */ +// Strict DWARF < 5 uses DW_LANG_C = 0x0002 +// { dg-final { scan-assembler "0x2\[ \t]\[^\n\r]* DW_AT_language" } } */ }
reply other threads:[~2022-11-16 11:49 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=20221116114936.A1B6A3959C95@sourceware.org \ --to=tschwinge@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).