From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout-p-101.mailbox.org (mout-p-101.mailbox.org [IPv6:2001:67c:2050::465:101]) by sourceware.org (Postfix) with ESMTPS id D953E385780F for ; Wed, 16 Dec 2020 00:15:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D953E385780F Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4CwbHd4rZWzQlPf; Wed, 16 Dec 2020 01:15:25 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter06.heinlein-hosting.de (spamfilter06.heinlein-hosting.de [80.241.56.125]) (amavisd-new, port 10030) with ESMTP id 8OJHGtwB927Y; Wed, 16 Dec 2020 01:15:18 +0100 (CET) From: Iain Buclaw To: gcc-patches@gcc.gnu.org Cc: iain@sandoe.co.uk, jason@redhat.com, Iain Buclaw Subject: [PATCH] d: Fix ICE in in force_decl_die, at dwarf2out.c with -gdwarf-2 -gstrict-dwarf [PR98067] Date: Wed, 16 Dec 2020 01:15:08 +0100 Message-Id: <20201216001508.2226259-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: X-Rspamd-Score: -0.53 / 15.00 / 15.00 X-Rspamd-Queue-Id: 8397C1876 X-Rspamd-UID: abe350 X-Spam-Status: No, score=-15.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2020 00:15:30 -0000 Hi, This patch fixes an ICE in dwarf2out.c that occurs when compiling a selective import declaration in D with strict dwarf2 in effect. Manifest constants in D are represented as CONST_DECLs, which can be imported from one module to another. However, when compiling on strict dwarf2 targets such as *-*darwin10, importing CONST_DECLs cannot be represented in debug as D did not exist as an AT_language until dwarf3, and the only available fallback being DW_LANG_C. As CONST_DECLs are treated as enumerators in C, and not outputted individually in gen_decl_die, this causes an internal error in force_decl_die to occur. To handle this, similar to other places in dwarf2out, if a CONST_DECL is seen in dwarf2out_imported_module_or_decl_1, then we simply return early if the language is not one of Ada, D, or Fortran. The new files and tests added are boilerplate for introducing gdc.dg/debug and gdc.dg/debug/dwarf2 test directories, as well as two extra tests - langdw2.d and langdw3.d - that verify that DW_LANG_D is set except for strict dwarf2. This has been bootstrapped, and the D testsuite regression tested on x86_64-linux-gnu/-m32/-mx32. OK for mainline? Iain. --- gcc/ChangeLog: PR d/98067 * dwarf2out.c (dwarf2out_imported_module_or_decl_1): Handle CONST_DECL only if is_fortran, is_ada, or is_dlang. gcc/testsuite/ChangeLog: PR d/98067 * gdc.dg/debug/debug.exp: New test. * gdc.dg/debug/dwarf2/dwarf2.exp: New test. * gdc.dg/debug/dwarf2/imports/pr98067.d: New test. * gdc.dg/debug/dwarf2/langdw2.d: New test. * gdc.dg/debug/dwarf2/langdw3.d: New test. * gdc.dg/debug/dwarf2/pr98067.d: New test. * gdc.dg/debug/trivial.d: New test. --- gcc/dwarf2out.c | 7 ++++ gcc/testsuite/gdc.dg/debug/debug.exp | 28 ++++++++++++++ gcc/testsuite/gdc.dg/debug/dwarf2/dwarf2.exp | 38 +++++++++++++++++++ .../gdc.dg/debug/dwarf2/imports/pr98067.d | 3 ++ gcc/testsuite/gdc.dg/debug/dwarf2/langdw2.d | 7 ++++ gcc/testsuite/gdc.dg/debug/dwarf2/langdw3.d | 6 +++ gcc/testsuite/gdc.dg/debug/dwarf2/pr98067.d | 6 +++ gcc/testsuite/gdc.dg/debug/trivial.d | 6 +++ 8 files changed, 101 insertions(+) create mode 100644 gcc/testsuite/gdc.dg/debug/debug.exp create mode 100644 gcc/testsuite/gdc.dg/debug/dwarf2/dwarf2.exp create mode 100644 gcc/testsuite/gdc.dg/debug/dwarf2/imports/pr98067.d create mode 100644 gcc/testsuite/gdc.dg/debug/dwarf2/langdw2.d create mode 100644 gcc/testsuite/gdc.dg/debug/dwarf2/langdw3.d create mode 100644 gcc/testsuite/gdc.dg/debug/dwarf2/pr98067.d create mode 100644 gcc/testsuite/gdc.dg/debug/trivial.d diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 0baa056447c..027f327c1a1 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -26705,6 +26705,13 @@ dwarf2out_imported_module_or_decl_1 (tree decl, gen_type_die_for_member (type, decl, get_context_die (TYPE_CONTEXT (type))); } + if (TREE_CODE (decl) == CONST_DECL) + { + /* Individual enumerators of an enum type do not get output here + (see gen_decl_die), so we cannot call force_decl_die. */ + if (!is_fortran () && !is_ada () && !is_dlang ()) + return; + } if (TREE_CODE (decl) == NAMELIST_DECL) at_import_die = gen_namelist_decl (DECL_NAME (decl), get_context_die (DECL_CONTEXT (decl)), diff --git a/gcc/testsuite/gdc.dg/debug/debug.exp b/gcc/testsuite/gdc.dg/debug/debug.exp new file mode 100644 index 00000000000..1607c4d6d44 --- /dev/null +++ b/gcc/testsuite/gdc.dg/debug/debug.exp @@ -0,0 +1,28 @@ +# Copyright (C) 2020 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +# Load support procs. +load_lib gdc-dg.exp + +# Initialize `dg'. +dg-init + +# Main loop. +gcc-dg-debug-runtest gdc_target_compile trivial.d [list -O -O3] \ + [lsort [glob -nocomplain $srcdir/$subdir/*.d]] + +# All done. +dg-finish diff --git a/gcc/testsuite/gdc.dg/debug/dwarf2/dwarf2.exp b/gcc/testsuite/gdc.dg/debug/dwarf2/dwarf2.exp new file mode 100644 index 00000000000..11711e197b9 --- /dev/null +++ b/gcc/testsuite/gdc.dg/debug/dwarf2/dwarf2.exp @@ -0,0 +1,38 @@ +# Copyright (C) 2020 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +# Load support procs. +load_lib gdc-dg.exp + +# If a testcase doesn't have special options, use these. +global DEFAULT_DFLAGS +if ![info exists DEFAULT_DFLAGS] then { + set DEFAULT_DFLAGS "-gdwarf" +} + +# Main loop. +set comp_output [gdc_target_compile \ + "$srcdir/$subdir/../trivial.d" "trivial.S" assembly \ + "additional_flags=-gdwarf"] +if { ! [string match "*: target system does not support the * debug format*" \ + $comp_output] } { + remove-build-file "trivial.S" + gdc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.d ] ] "" \ + $DEFAULT_DFLAGS +} + +# All done. +dg-finish diff --git a/gcc/testsuite/gdc.dg/debug/dwarf2/imports/pr98067.d b/gcc/testsuite/gdc.dg/debug/dwarf2/imports/pr98067.d new file mode 100644 index 00000000000..d740d71a3e4 --- /dev/null +++ b/gcc/testsuite/gdc.dg/debug/dwarf2/imports/pr98067.d @@ -0,0 +1,3 @@ +module imports.pr98067; + +enum MAP_ANON = 0x10; diff --git a/gcc/testsuite/gdc.dg/debug/dwarf2/langdw2.d b/gcc/testsuite/gdc.dg/debug/dwarf2/langdw2.d new file mode 100644 index 00000000000..61c39279d8d --- /dev/null +++ b/gcc/testsuite/gdc.dg/debug/dwarf2/langdw2.d @@ -0,0 +1,7 @@ +// DW_LANG_D is not available in dwarf2, so we should produce DW_LANG_C (0x2) +// as AT_language. +// { dg-do compile } +// { dg-options "-gdwarf-2 -gstrict-dwarf -dA" } +// { dg-final { scan-assembler "0x2\[^\n\r\]*AT_language" } } + +module langdw2; diff --git a/gcc/testsuite/gdc.dg/debug/dwarf2/langdw3.d b/gcc/testsuite/gdc.dg/debug/dwarf2/langdw3.d new file mode 100644 index 00000000000..7bdc68c4607 --- /dev/null +++ b/gcc/testsuite/gdc.dg/debug/dwarf2/langdw3.d @@ -0,0 +1,6 @@ +// We should produce DW_LANG_D (0x13) as AT_language. +// { dg-do compile } +// { dg-options "-gdwarf-3 -dA" } +// { dg-final { scan-assembler "0x13\[^\n\r\]*AT_language" } } + +module langdw3; diff --git a/gcc/testsuite/gdc.dg/debug/dwarf2/pr98067.d b/gcc/testsuite/gdc.dg/debug/dwarf2/pr98067.d new file mode 100644 index 00000000000..4beb268e41d --- /dev/null +++ b/gcc/testsuite/gdc.dg/debug/dwarf2/pr98067.d @@ -0,0 +1,6 @@ +// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98067 +// { dg-options "-gdwarf-2 -gstrict-dwarf -I $srcdir/gdc.dg/debug/dwarf2" } +// { dg-do compile } +module pr98067; + +import imports.pr98067 : MAP_ANON; diff --git a/gcc/testsuite/gdc.dg/debug/trivial.d b/gcc/testsuite/gdc.dg/debug/trivial.d new file mode 100644 index 00000000000..dab2b683a49 --- /dev/null +++ b/gcc/testsuite/gdc.dg/debug/trivial.d @@ -0,0 +1,6 @@ +/* { dg-do run } */ + +int main() +{ + return 0; +} -- 2.27.0