From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 0BC933835425 for ; Fri, 22 Jul 2022 12:35:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0BC933835425 Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-248-LrH69MQUO56OysbsyKuTrA-1; Fri, 22 Jul 2022 08:35:57 -0400 X-MC-Unique: LrH69MQUO56OysbsyKuTrA-1 Received: by mail-qv1-f70.google.com with SMTP id nn4-20020a056214358400b00474025b619eso2932943qvb.2 for ; Fri, 22 Jul 2022 05:35:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=EoeLXIj3AC7FX6eCp9W9GJAJjh8fufC8Qxo0KWKebTo=; b=jYwU4vyLldl+OBh396ot1mC3FQ8giPHqlpwC+p47sz73QXNluQSjPTNNpYNt8yloQ3 D9Q32F2nyFsvfv+HtoijQqaFVktQA77JMv7jKWPqvRxGuPUOZaLsHmx1jPL+Ct+48Cwz ZU43CF3PKEJmvM30uORw5sd/EZgsBtuePwW15CU9TVg9X5YMIheyNqyUrIuJ3mBTjyrq F7OGz4rXimM+rwvGBDe4OjYuqxizDTy0Wr25I5Y506+jvpxCgusf2UusmHrA/v/fFXxq yDOkDuD+pnNmAjDnH9fC0+3SDVFukH3L9aB+OfKi8aryucfnbhshQnifK8JOoBWSP7ib E+RA== X-Gm-Message-State: AJIora/IsUpD+yqDvcXWxbAEEZQZIGuPi9d83S/m0U0QK1GiSXn4605E hq7pTGRYOXKWNnS83p1HdIBGQwNqWkGunMafg5oXbU7QTWbYaMMPVnQ5zqvYwns/rTHlnj1xihr cdHVQhVYxEVIuNholKPOOIuEXjp1bqk2zILJ4wOursub2ekBYd6wkrQRceLwSO6CKuvg3 X-Received: by 2002:a05:620a:461e:b0:6b5:f9b9:5f70 with SMTP id br30-20020a05620a461e00b006b5f9b95f70mr339347qkb.631.1658493356330; Fri, 22 Jul 2022 05:35:56 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uuTCVbJkTVwrzQdFiHn/xh8q174/TYM2AwiDNQt4SJhpxFyQyStZGUDpcGC40M8NCA941rug== X-Received: by 2002:a05:620a:461e:b0:6b5:f9b9:5f70 with SMTP id br30-20020a05620a461e00b006b5f9b95f70mr339319qkb.631.1658493356010; Fri, 22 Jul 2022 05:35:56 -0700 (PDT) Received: from redhat.com ([2601:184:4780:4310::b5c3]) by smtp.gmail.com with ESMTPSA id x14-20020a05620a12ae00b006b53fe19c41sm3099395qki.14.2022.07.22.05.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 05:35:55 -0700 (PDT) Date: Fri, 22 Jul 2022 08:35:53 -0400 From: Marek Polacek To: GCC Patches , Jason Merrill Subject: Re: [PATCH] c++: ICE with erroneous template redeclaration [PR106311] Message-ID: References: <20220715152920.693196-1-polacek@redhat.com> MIME-Version: 1.0 In-Reply-To: <20220715152920.693196-1-polacek@redhat.com> User-Agent: Mutt/2.2.6 (2022-06-05) X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Fri, 22 Jul 2022 12:36:02 -0000 Ping. On Fri, Jul 15, 2022 at 11:29:20AM -0400, Marek Polacek via Gcc-patches wrote: > Here we ICE trying to get DECL_SOURCE_LOCATION of the parm that happens > to be error_mark_node in this ill-formed test. I kept running into this > while reducing code, so it'd be good to have it fixed. > > Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? > > PR c++/106311 > > gcc/cp/ChangeLog: > > * pt.cc (redeclare_class_template): Check DECL_P before accessing > DECL_SOURCE_LOCATION. > > gcc/testsuite/ChangeLog: > > * g++.dg/template/redecl5.C: New test. > --- > gcc/cp/pt.cc | 3 ++- > gcc/testsuite/g++.dg/template/redecl5.C | 5 +++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > create mode 100644 gcc/testsuite/g++.dg/template/redecl5.C > > diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc > index 718dfa5bfa8..0a294e91a79 100644 > --- a/gcc/cp/pt.cc > +++ b/gcc/cp/pt.cc > @@ -6377,7 +6377,8 @@ redeclare_class_template (tree type, tree parms, tree cons) > { > auto_diagnostic_group d; > error ("template parameter %q+#D", tmpl_parm); > - inform (DECL_SOURCE_LOCATION (parm), "redeclared here as %q#D", parm); > + inform (DECL_P (parm) ? DECL_SOURCE_LOCATION (parm) : input_location, > + "redeclared here as %q#D", parm); > return false; > } > > diff --git a/gcc/testsuite/g++.dg/template/redecl5.C b/gcc/testsuite/g++.dg/template/redecl5.C > new file mode 100644 > index 00000000000..fb2d698e6bc > --- /dev/null > +++ b/gcc/testsuite/g++.dg/template/redecl5.C > @@ -0,0 +1,5 @@ > +// PR c++/106311 > +// { dg-do compile } > + > +template struct array; // { dg-error "template parameter" } > +template struct array { }; // { dg-error "declared" } > > base-commit: 23dd41c480fa9f06c33c1e6090bbae53869f85af > -- > 2.36.1 > Marek