From patchwork Thu Nov 18 20:47:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: will wray X-Patchwork-Id: 47905 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7A1B7385803B for ; Thu, 18 Nov 2021 20:48:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7A1B7385803B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1637268537; bh=snkPN3fCeGCZTbuUSAgSfCSWRbs+FXGS8GF4L3wuxkQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=cUcfBzh4Y2iAX6UaZd1MDlR6JuthEnSSZ6qtXBWa1AxZ/CpYi+1HHXMsRl99Xe79U zbmKUd2MXXfRT4qZrY9VTtY6WI7pqB1eI8+m0w94xfTgzw2MerBH71Pj4dronyI3TT 4GYp4Zxpg1mQLPJT6zpUn7MAqstQ53myk92hZ1bw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by sourceware.org (Postfix) with ESMTPS id 89C493858422 for ; Thu, 18 Nov 2021 20:48:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 89C493858422 Received: by mail-il1-x134.google.com with SMTP id j21so2362558ila.5 for ; Thu, 18 Nov 2021 12:48:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=snkPN3fCeGCZTbuUSAgSfCSWRbs+FXGS8GF4L3wuxkQ=; b=pQkymrLRmFvaNQoU4dnYHEPawOdNZ1FBVhIeaSnvPCyvjUKUnSGctA6IYTaRXnY2BN gBJAWLNlQwUNS8JR0GN+Y93h8ANuGEGsn5hfM4+bXlmxtl0pO2HBAABZIFUCDxiNCA89 WQ7/RVShkHkl7luFkX9q+ZyMa7AxqGEcH8Ac7hJap4Mhph68I0Rcaj7TpIjjkAnQwWmv Z7fOkV3pVrfub82NqrPFVa29MBGXj0jWtRQGb0FS0aZ0vqc2ZgoO2zbQ2HUOBRkq8Dpg zUv9X/mVE5tzKdaEjrpzIHUKr5x5n2Cnjw6Opb0/IZENFO1Fz+GhkeQDxxmvHO+qg8X+ EQGQ== X-Gm-Message-State: AOAM530KhJUqX9yrDJZZvhRIbhTYmUkYPXruQmuwlZSzksaMowl3Nrla om6RiaURwXCzXcHgLIWa0HFWxBSOyt0= X-Google-Smtp-Source: ABdhPJxxR3iF+pvfeWtI/jyV5sF3ry4Z2cRPUNynYAup2GeM/qmAP9E++tAJc5h40fDlb6Yln9SeDQ== X-Received: by 2002:a05:6e02:198e:: with SMTP id g14mr1369400ilf.204.1637268506415; Thu, 18 Nov 2021 12:48:26 -0800 (PST) Received: from localhost.localdomain (bras-base-sttnpq8102w-grc-16-142-115-13-133.dsl.bell.ca. [142.115.13.133]) by smtp.googlemail.com with ESMTPSA id h15sm568295ili.26.2021.11.18.12.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 12:48:25 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [PATCH v2] c++: designated init of char array by string constant [PR55227] Date: Thu, 18 Nov 2021 15:47:24 -0500 Message-Id: <20211118204724.2514300-1-wjwray@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Will Wray via Gcc-patches From: will wray Reply-To: Will Wray Cc: Will Wray Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Also address "FIXME: this code is duplicated from reshape_init" in cp_complete_array_type by always calling reshape_init on init-list. PR c++/55227 gcc/cp/ChangeLog: * decl.c (reshape_init_r): Only call has_designator_check when first_initializer_p or for the inner constructor element. (cp_complete_array_type): Call reshape_init on braced-init-list. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/desig20.C: New test. --- gcc/cp/decl.c | 42 +++++++++++++------------------ gcc/testsuite/g++.dg/cpp2a/desig20.C | 48 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 25 deletions(-) diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 2ddf0e4a524..83a2d3bf8f1 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -6824,28 +6824,31 @@ reshape_init_r (tree type, reshape_iter *d, tree first_initializer_p, if (TREE_CODE (type) == ARRAY_TYPE && char_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (type)))) { - tree str_init = init; - tree stripped_str_init = stripped_init; + tree arr_init = init; + tree stripped_arr_init = stripped_init; + reshape_iter stripd = {}; /* Strip one level of braces if and only if they enclose a single element (as allowed by [dcl.init.string]). */ if (!first_initializer_p - && TREE_CODE (stripped_str_init) == CONSTRUCTOR - && CONSTRUCTOR_NELTS (stripped_str_init) == 1) + && TREE_CODE (stripped_arr_init) == CONSTRUCTOR + && CONSTRUCTOR_NELTS (stripped_arr_init) == 1) { - str_init = (*CONSTRUCTOR_ELTS (stripped_str_init))[0].value; - stripped_str_init = tree_strip_any_location_wrapper (str_init); + stripd.cur = CONSTRUCTOR_ELT (stripped_arr_init, 0); + arr_init = stripd.cur->value; + stripped_arr_init = tree_strip_any_location_wrapper (arr_init); } /* If it's a string literal, then it's the initializer for the array as a whole. Otherwise, continue with normal initialization for array types (one value per array element). */ - if (TREE_CODE (stripped_str_init) == STRING_CST) + if (TREE_CODE (stripped_arr_init) == STRING_CST) { - if (has_designator_problem (d, complain)) + if ((first_initializer_p && has_designator_problem (d, complain)) + || (stripd.cur && has_designator_problem (&stripd, complain))) return error_mark_node; d->cur++; - return str_init; + return arr_init; } } @@ -9545,22 +9548,11 @@ cp_complete_array_type (tree *ptype, tree initial_value, bool do_default) if (initial_value) { /* An array of character type can be initialized from a - brace-enclosed string constant. - - FIXME: this code is duplicated from reshape_init. Probably - we should just call reshape_init here? */ - if (char_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (*ptype))) - && TREE_CODE (initial_value) == CONSTRUCTOR - && !vec_safe_is_empty (CONSTRUCTOR_ELTS (initial_value))) - { - vec *v = CONSTRUCTOR_ELTS (initial_value); - tree value = (*v)[0].value; - STRIP_ANY_LOCATION_WRAPPER (value); - - if (TREE_CODE (value) == STRING_CST - && v->length () == 1) - initial_value = value; - } + brace-enclosed string constant so call reshape_init to + remove the optional braces from a braced string literal. */ + if (BRACE_ENCLOSED_INITIALIZER_P (initial_value)) + initial_value = reshape_init (*ptype, initial_value, + tf_warning_or_error); /* If any of the elements are parameter packs, we can't actually complete this type now because the array size is dependent. */ diff --git a/gcc/testsuite/g++.dg/cpp2a/desig20.C b/gcc/testsuite/g++.dg/cpp2a/desig20.C new file mode 100644 index 00000000000..7904fcace7f --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/desig20.C @@ -0,0 +1,48 @@ +// PR c++/55227 +// Test designated initializer for char array by string constant + +// { dg-options "" } + +struct C {char a[2];}; + +/* Case a, designated, unbraced, string-literal of the exact same size + as the initialized char array; valid and accepted before and after. */ +C a = {.a="a"}; + +/* Cases b,c,d, designated, braced or mimatched-size, string literal, + previously rejected; "C99 designator 'a' outside aggregate initializer". */ +C b = {.a=""}; +C c = {.a={""}}; +C d = {.a={"a"}}; + +/* Case e, designated char array field and braced, designated array element(s) + (with GNU [N]= extension) valid and accepted before and after. */ +C e = {.a={[0]='a'}}; + +/* Cases f,g,h, braced string literal, 'designated' within inner braces; + invalid, previously accepted as positional with 'designator' ignored. */ +C f = {{[0]="a"}}; // { dg-error "C99 designator .0. outside aggregate initializer" } +C g = {{.a="a"}}; // { dg-error "C99 designator .a. outside aggregate initializer" } +C h = {{.b="a"}}; // { dg-error "C99 designator .b. outside aggregate initializer" } + +char a2[][10] = { [0] = { "aaa" } }; + +struct D { C c; int a[8]; }; + +constexpr D x = { .c {.a={"a"}}, .a={1,2,3,4,5,6,7,8} }; + +struct A { union { int a; char c[4]; }; }; + +A non { .c = "c++" }; + +template +void t() +{ + C ca[] = { {.a=""}, {.a={""}}, }; + +} + +void u() +{ + return t(); +}