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 DC2F73858407 for ; Wed, 19 Jul 2023 19:24:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DC2F73858407 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689794655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y96iH8fNZ8T+8mW55mZr+xCBXCR0AFAoqYye9oq4Bac=; b=IBDSzlGhF9SjWuDzitEGuxpUYdh8iADzf1PZgQQ1BDnAH1QHGLRuQjYDgJYSyol+PkF2yp u22H/oodjUJQJRZQ3nGPfynes3Zk58LwsXHcK8CJyPPJlViGYp3b2MpTx2s5D4Na1HksGf ynOui5dXEQCxL2DuvmhacMFEVv+05W8= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-354-dkTMkhu7NoeEfXTjU0IB6A-1; Wed, 19 Jul 2023 15:24:13 -0400 X-MC-Unique: dkTMkhu7NoeEfXTjU0IB6A-1 Received: by mail-qv1-f72.google.com with SMTP id 6a1803df08f44-63c66a92001so250296d6.2 for ; Wed, 19 Jul 2023 12:24:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689794652; x=1692386652; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Y96iH8fNZ8T+8mW55mZr+xCBXCR0AFAoqYye9oq4Bac=; b=fL4etxHiSjtstoWCnz+J6VnDPuqTm6xV9JRRoO07lMo5q88Sgs1aK6wNoB5Hr1t0Ep SVy3ejPUibsu4H9hZUNH4JexUTI345bAVy6eRPgv2oLDmG+PS7FDYXhRX0TOoxtUENr8 Fmtu7et2pwLz5mv/IkiJ1NcatAFI6u8wx8b/9ujK2PvIL4553fkSWX5LcGpHOwE17nev 1cK+b2PZhPWkzHZtIQLos3qnM+CVbzoNnLKnWxLN60xLCjLt0S4LheM7q4ew+0FWadQE pUihq0G0erHLbODYoQEQp+N39IHMb6HoTySd/z07aEWoIdmV5sGjNtUswnYlcLXPvM/p fc1g== X-Gm-Message-State: ABy/qLal/DMf9iVEsnuv7mlHLA5gCfQzH86mznEQZYlsqOBU4F1SVKxK I/Ae8f1o66k4CPjGwe418N4wHxTYnZGerRjdcsQIwE5x1u8ZUKjqpTteoFa0gW5TdSvw2TaYIvs /jWN0KohudJRmfaJwQdYmsogSFw== X-Received: by 2002:a0c:f5c9:0:b0:63c:7154:1674 with SMTP id q9-20020a0cf5c9000000b0063c71541674mr3109128qvm.35.1689794652559; Wed, 19 Jul 2023 12:24:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlGRTM3D7GKYopPFER4qyj1Bdl5iT2YKEDne5odA1NWeDaykBNFVETr9ZDdNe/AFKt4DuzDZcQ== X-Received: by 2002:a0c:f5c9:0:b0:63c:7154:1674 with SMTP id q9-20020a0cf5c9000000b0063c71541674mr3109112qvm.35.1689794652194; Wed, 19 Jul 2023 12:24:12 -0700 (PDT) Received: from [192.168.1.108] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id x18-20020a0ca892000000b0062ffbf23c22sm1663803qva.131.2023.07.19.12.24.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 19 Jul 2023 12:24:11 -0700 (PDT) Message-ID: Date: Wed, 19 Jul 2023 15:24:10 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH] c++: fix ICE with designated initializer [PR110114] To: Marek Polacek , Patrick Palka Cc: GCC Patches References: <20230719180053.46101-1-polacek@redhat.com> <3efd2e0c-1c18-de91-4708-dfd1892ecb11@idea> From: Jason Merrill In-Reply-To: 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=-12.6 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_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 List-Id: On 7/19/23 14:38, Marek Polacek wrote: > On Wed, Jul 19, 2023 at 02:32:15PM -0400, Patrick Palka wrote: >> On Wed, 19 Jul 2023, Marek Polacek wrote: >> >>> Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? >> >> LGTM. It might be preferable to check COMPLETE_TYPE_P in the caller >> instead, so that we avoid inspecting CLASSTYPE_NON_AGGREGATE on an >> incomplete class type, and so that the caller doesn't "commit" to >> building an aggregate conversion. > > Perhaps. I wanted to avoid the call to build_user_type_conversion_1. > I could add an early return to implicit_conversion_1 but I'd have to > move some code around not to check COMPLETE_TYPE_P before complete_type. Maybe return NULL for the incomplete case here, rather than just skipping reshape_init? /* Call reshape_init early to remove redundant braces. */ if (expr && BRACE_ENCLOSED_INITIALIZER_P (expr) && CLASS_TYPE_P (to) && COMPLETE_TYPE_P (complete_type (to)) && !CLASSTYPE_NON_AGGREGATE (to)) { expr = reshape_init (to, expr, complain); if (expr == error_mark_node) return NULL; from = TREE_TYPE (expr); } If that doesn't work, the patch is fine as-is. >>> -- >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 >>> >>> 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" } >>> +} >>> >>> base-commit: 2971ff7b1d564ac04b537d907c70e6093af70832 >>> -- >>> 2.41.0 >>> >>> >> > > Marek >