From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by sourceware.org (Postfix) with ESMTPS id A68C03858D37 for ; Wed, 30 Nov 2022 17:18:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A68C03858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=marvell.com Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AUCgSZC021060 for ; Wed, 30 Nov 2022 09:18:23 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0220; bh=Rb4qXFBhHKQQhQ7cnRaAKwOPOs8aJ8e3nwCO7Ul/lko=; b=BAsxfAxxn6AI50rrFsaLq6ST/hVPo/T4vtzC1cLvjvjxgT38K9e0rLtkAs2S5HDzPlhE FFEdbUBIg3TCxJNcUfsyKqD70RTVrtgchiPXvI8Y96EQgmIiTflL9GDGXDMk2jxSUlk/ LVGxBQRb7T49nlPhOZ3xB1PqhB3YMXi+ZCPnViMWXBu3kuiGt/Nyrh5NsQbNs5eOhAZr njCy2U01lWkphy0rCBvaF0ywcHPw2az3YlKBDyj+SDhhDBxM9+zehSJOEJW4Kb1rod5u vnp86lz5ilawQeuQpkXLWw55ZJKPijWOCUn2XwuWe61aLU04jVCOB857DdOrHkMFoX3t EQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3m3k6wgpev-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 30 Nov 2022 09:18:23 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 30 Nov 2022 09:18:20 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 30 Nov 2022 09:18:20 -0800 Received: from linux.wrightpinski.org.com (unknown [10.69.242.198]) by maili.marvell.com (Postfix) with ESMTP id 9A3C93F7051; Wed, 30 Nov 2022 09:18:20 -0800 (PST) From: To: CC: Andrew Pinski Subject: [PATCH 1/2] Fix C/107926: Wrong error message when initializing char array Date: Wed, 30 Nov 2022 09:18:14 -0800 Message-ID: <1669828695-18532-1-git-send-email-apinski@marvell.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-GUID: CZZ2J-vkAOp0Y-FG0r8kZKQsltmGQ9Ly X-Proofpoint-ORIG-GUID: CZZ2J-vkAOp0Y-FG0r8kZKQsltmGQ9Ly X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-30_04,2022-11-30_02,2022-06-22_01 X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,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 List-Id: From: Andrew Pinski The problem here is the code which handles {"a"} is supposed to handle the case where the is something after the string but it only handles the case where there is another string so we go down the other path and error out saying "excess elements in struct initializer" even though this was a character array. To fix this, we need to move the ckeck if the initializer is a string after the check for array and initializer. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. Thanks, Adnrew Pinski gcc/c/ChangeLog: PR c/107926 * c-typeck.cc (process_init_element): Move the ceck for string cst until after the error message. gcc/testsuite/ChangeLog: PR c/107926 * gcc.dg/init-excess-3.c: New test. --- gcc/c/c-typeck.cc | 15 ++++++++++----- gcc/testsuite/gcc.dg/init-excess-3.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/init-excess-3.c diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc index e06f052..0fc382c 100644 --- a/gcc/c/c-typeck.cc +++ b/gcc/c/c-typeck.cc @@ -10623,17 +10623,22 @@ process_init_element (location_t loc, struct c_expr value, bool implicit, /* Handle superfluous braces around string cst as in char x[] = {"foo"}; */ - if (string_flag - && constructor_type + if (constructor_type && !was_designated && TREE_CODE (constructor_type) == ARRAY_TYPE && INTEGRAL_TYPE_P (TREE_TYPE (constructor_type)) && integer_zerop (constructor_unfilled_index)) { if (constructor_stack->replacement_value.value) - error_init (loc, "excess elements in % array initializer"); - constructor_stack->replacement_value = value; - return; + { + error_init (loc, "excess elements in % array initializer"); + return; + } + else if (string_flag) + { + constructor_stack->replacement_value = value; + return; + } } if (constructor_stack->replacement_value.value != NULL_TREE) diff --git a/gcc/testsuite/gcc.dg/init-excess-3.c b/gcc/testsuite/gcc.dg/init-excess-3.c new file mode 100644 index 0000000..7741261 --- /dev/null +++ b/gcc/testsuite/gcc.dg/init-excess-3.c @@ -0,0 +1,15 @@ +/* Test for various cases of excess initializers for char arrays, + bug 107926. */ +/* { dg-do compile } */ +/* { dg-options "" } */ + + +char s0[] = {"abc",1}; /* { dg-error "array initializer|near init" } */ +char s1[] = {"abc","a"}; /* { dg-error "array initializer|near init" } */ +char s2[] = {1,"abc"}; /* { dg-error "array initializer|near init|computable at load time" } */ +/* { dg-warning "integer from pointer without a cast" "" { target *-*-* } .-1 } */ + +char s3[5] = {"abc",1}; /* { dg-error "array initializer|near init" } */ +char s4[5] = {"abc","a"}; /* { dg-error "array initializer|near init" } */ +char s5[5] = {1,"abc"}; /* { dg-error "array initializer|near init|computable at load time" } */ +/* { dg-warning "integer from pointer without a cast" "" { target *-*-* } .-1 } */ -- 1.8.3.1