From patchwork Wed Jul 19 18:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 122759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:410:b0:134:c3fc:3153 with SMTP id 16csp4239626rwd; Wed, 19 Jul 2023 11:01:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlEN48uVbMh9ukrdXJks/tR6EDMsFa7zmYr5IKliA5TphqHVilhtQl9sK4Nfgt0NNWGhm335 X-Received: by 2002:aa7:c452:0:b0:51e:4439:f480 with SMTP id n18-20020aa7c452000000b0051e4439f480mr3274027edr.34.1689789708862; Wed, 19 Jul 2023 11:01:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689789708; cv=none; d=google.com; s=arc-20160816; b=r+8YoiiyvygsfHLF/OQ+1QzlL5Tdemr3e8tfPrVUEmRPgVCXCEIEaUgj7Jiohels/q rYpepCSRqAzkr9AKxnVju1l/P4s6DI47RinNGsHKgilaFXQvGL9kzR+KyeTajJtQpdf8 3rNnjg/BJA50Nj4qGT+/MfuS2nucRQSN1QjIUknxavK9mdXVyOCoqu+gwmUkvvOTJTeS s9sNEbYuJi6Oh0psLKv2Uucj07TkbxEidZz0FlQtNRg4imb7EGT5kx5u6EkHImyXbjMY o2FPl3gwsjaTaWV6ZSjBu9Kw2YIpr7fmgWWJyov+tdOdqJKrnzSCd8k3LNk6FdZw7Olz ENsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=j7/UIsKbAUDv9delZzg6EuxfhrZgsyrAp6T72plAQu0=; fh=kNmS2mlzpUT76AmBO0Fe4g4eh3Wmp3HQAPt13Lug46g=; b=r33fg8WNHL7zuX/Wr5yijs6I2YsYJ2CvYCN748aaF7CgGkF6isnl2AbH9qngFW6I6Z Add0qaIDfpoNxo1WIGOYWM8uTUrbwJOXs8pj6IhZsJB4s1lMdkNmWcLrUYbwvNjnrAXC gE7YpcWmIVSbN4OqbeqghqXk0kMPFsY7yAzaJjz0ESgohuLyotO73pMa39sfP+clLZY+ ZruS1RYnIsfLk8mKf3OKgW0yqizA8EXbXkfRyjNWGv/7Vg2/UXp0FdT1bn6wsxvX2w5n Cts+7SUB3MKWy80890KRwl2IPLUI8aH+dCXUeu6nQNFs9oVjYgMBQ3o3/ELwxxzKlhvJ /YiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=kiXbJ5Hc; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id l8-20020aa7c3c8000000b00521985f581bsi3259216edr.27.2023.07.19.11.01.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 11:01:48 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=kiXbJ5Hc; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 62BFB3857713 for ; Wed, 19 Jul 2023 18:01:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 62BFB3857713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689789707; bh=j7/UIsKbAUDv9delZzg6EuxfhrZgsyrAp6T72plAQu0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=kiXbJ5Hcw+Rzc9O5j5g6i0ZcgQSS8RxbXiBUxru1b05xqJxgmrXNSlq461ILwiBZd Ux87IS9HIQqxVTIQ6TQKD1ju4TAcIXFrk+utyyC1Eihzuwrx3YmC54sY9OEZMchaQP rgclJ7l2IkL5SW/5wze7CniequIzYGyivVH6uupo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 CD3D53858C33 for ; Wed, 19 Jul 2023 18:01:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD3D53858C33 Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-190-6LDKwL2QNGKgWtHIRaKP6g-1; Wed, 19 Jul 2023 14:01:00 -0400 X-MC-Unique: 6LDKwL2QNGKgWtHIRaKP6g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9724929AB3EB for ; Wed, 19 Jul 2023 18:00:59 +0000 (UTC) Received: from pdp-11.lan (unknown [10.22.9.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5AD08C2C85C; Wed, 19 Jul 2023 18:00:59 +0000 (UTC) To: GCC Patches , Jason Merrill Cc: Patrick Palka Subject: [PATCH] c++: fix ICE with designated initializer [PR110114] Date: Wed, 19 Jul 2023 14:00:53 -0400 Message-ID: <20230719180053.46101-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 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, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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-Patchwork-Original-From: Marek Polacek via Gcc-patches From: Marek Polacek Reply-To: Marek Polacek Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771872933789515169 X-GMAIL-MSGID: 1771872933789515169 Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? -- >8 -- r13-1227 added an assert checking that the index in a CONSTRUCTOR is a FIELD_DECL. That's a reasonable assumption but in this case we never called reshape_init due to the type being incomplete, and so the index remained an identifier node: get_class_binding never got around to looking up the FIELD_DECL. We can avoid the crash by returning early in build_aggr_conv; we'd return NULL anyway due to: if (i < CONSTRUCTOR_NELTS (ctor)) return NULL; PR c++/110114 gcc/cp/ChangeLog: * call.cc (build_aggr_conv): Return early if the type isn't complete. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/desig28.C: New test. * g++.dg/cpp2a/desig29.C: New test. --- gcc/cp/call.cc | 5 +++++ gcc/testsuite/g++.dg/cpp2a/desig28.C | 17 +++++++++++++++++ gcc/testsuite/g++.dg/cpp2a/desig29.C | 10 ++++++++++ 3 files changed, 32 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp2a/desig28.C create mode 100644 gcc/testsuite/g++.dg/cpp2a/desig29.C base-commit: 2971ff7b1d564ac04b537d907c70e6093af70832 diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index b55230d98aa..0af20a81717 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -986,6 +986,11 @@ build_aggr_conv (tree type, tree ctor, int flags, tsubst_flags_t complain) tree empty_ctor = NULL_TREE; hash_set pset; + /* We've called complete_type on TYPE before calling this function, but + perhaps it wasn't successful. */ + if (!COMPLETE_TYPE_P (type)) + return nullptr; + /* We already called reshape_init in implicit_conversion, but it might not have done anything in the case of parenthesized aggr init. */ diff --git a/gcc/testsuite/g++.dg/cpp2a/desig28.C b/gcc/testsuite/g++.dg/cpp2a/desig28.C new file mode 100644 index 00000000000..b63265fea51 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/desig28.C @@ -0,0 +1,17 @@ +// PR c++/110114 +// { dg-do compile { target c++20 } } + +struct A { + int a,b; +}; + +struct B; + +void foo(const A &) {} +void foo(const B &) {} + +int +main () +{ + foo({.a=0}); +} diff --git a/gcc/testsuite/g++.dg/cpp2a/desig29.C b/gcc/testsuite/g++.dg/cpp2a/desig29.C new file mode 100644 index 00000000000..bd1a82b041d --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/desig29.C @@ -0,0 +1,10 @@ +// PR c++/110114 +// { dg-do compile { target c++20 } } + +struct B; + +void foo(const B &) {} + +int main() { + foo({.a=0}); // { dg-error "invalid" } +}