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.129.124]) by sourceware.org (Postfix) with ESMTPS id 2567F3858015 for ; Fri, 22 Jul 2022 21:22:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2567F3858015 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-607-97NEZWBaNlCxkimmO-6z0Q-1; Fri, 22 Jul 2022 17:22:01 -0400 X-MC-Unique: 97NEZWBaNlCxkimmO-6z0Q-1 Received: by mail-qk1-f200.google.com with SMTP id de4-20020a05620a370400b006a9711bd9f8so4569721qkb.9 for ; Fri, 22 Jul 2022 14:22:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=rSJArRVfGEPK/T4QyNxzm+DP7/DBnznHcOA1FvQlpA0=; b=axmKxtN0+Ei7oxdjavOkhEoXniieL7NVzKFrRtuz4ITwwxqRw2rLEc7UMAPz91TuYE LhabqJsPg/UOz5EJrsJenFlpt815tdS2WOJTuhqmdKWNadoA5ZAgnCBZfCkw8BoA0ywq 6pCd7v0ZTEafu95b7fCYVxQg4C/XzKXIXbcsy6sQXu2lYlhb0GpFG0C4eK8cYM0irnC6 Sc1bRH1PwGeP9FGcgAEfJxp+cC+Ar5Oj95hX0CBrBIYujif8bpg4AgTdw76f+T4yIFNJ nUmQWuL/B7dSEegQHmGMFT5O1ZcTEOi8Ww0TkGJWre4jvLFi9F2rYXir5QFezUqH8GHS AAfg== X-Gm-Message-State: AJIora/XZd/f/YC/+R/KamaUUem2WPmYspRHQZy9gj1z9HIu4XxHGR+k K2SLUq0owvbybSPEKaZdiG+3d6ejFcH59WrmHm65Qv2KflMHbSD0T6SIzUMnjYeO6VyEGLfopSZ jk1Ph3rbuzc5xLIhNcA== X-Received: by 2002:a05:622a:164a:b0:31e:d373:b1e5 with SMTP id y10-20020a05622a164a00b0031ed373b1e5mr1787917qtj.689.1658524920781; Fri, 22 Jul 2022 14:22:00 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vlNabQ3bZFkyjLUx/XgquCEwtf0znE9pj0s9hqCbiBG7b8hpaHYZfQrWPMEJMP//811NFj8Q== X-Received: by 2002:a05:622a:164a:b0:31e:d373:b1e5 with SMTP id y10-20020a05622a164a00b0031ed373b1e5mr1787900qtj.689.1658524920434; Fri, 22 Jul 2022 14:22:00 -0700 (PDT) Received: from [192.168.1.100] (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id y11-20020a05622a004b00b003051f450049sm3897292qtw.8.2022.07.22.14.21.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Jul 2022 14:21:59 -0700 (PDT) Message-ID: <025f644d-be71-707b-22a3-cbdeb212517f@redhat.com> Date: Fri, 22 Jul 2022 17:21:58 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] c++: ICE with erroneous template redeclaration [PR106311] To: Marek Polacek , GCC Patches References: <20220715152920.693196-1-polacek@redhat.com> From: Jason Merrill In-Reply-To: <20220715152920.693196-1-polacek@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, 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 21:22:08 -0000 On 7/15/22 11:29, Marek Polacek 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); If we're checking DECL_P, probably we also should avoid passing it to %q#D if it's false? > 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