From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by sourceware.org (Postfix) with ESMTPS id 30FCA385842E for ; Wed, 30 Nov 2022 17:18:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 30FCA385842E 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 (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2AU8rTWO029435 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 : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=snFTUEITY9tP8xNB58bnD7FRyVG4yFjPkZ9FB+fa5/U=; b=EJmbtHEbKQ7P76N3n71zQ7Ix+9kvdXFi51TbY4hV1fF8dDCm+XIxRnLJ/jf64qc2B3yL 3PLtvVGphTQh2blV2ngyjxsPhTzUSyJ0wIDMUpuWdbPTReDsW+xawwubuhuRCfJSSoZC pMfXYuEKrykJFcTyPqPqMb2Gs5s6RTR2g6kitulMWBZ4MpElMofJa+1TLueseIixPQVy 1axlFSp2Xl7Cmwunc6IHkTSlT57mm2QGJoMOXpdY0pBSfuEzfo4Ao3eCHLr8FhMr2Bkq Dcygy6OVdwORhHVRx0T2E6nLDYX6e+KRAIEdSfiHNOxu2eTdGK9sEIzaB0ixCsxK8Ban VQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3m642d9qac-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 30 Nov 2022 09:18:22 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Wed, 30 Nov 2022 09:18:21 -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:21 -0800 Received: from linux.wrightpinski.org.com (unknown [10.69.242.198]) by maili.marvell.com (Postfix) with ESMTP id 0C2CA3F7055; Wed, 30 Nov 2022 09:18:20 -0800 (PST) From: To: CC: Andrew Pinski Subject: [PATCH 2/2] Improve error message for excess elements in array initializer from {"a"} Date: Wed, 30 Nov 2022 09:18:15 -0800 Message-ID: <1669828695-18532-2-git-send-email-apinski@marvell.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1669828695-18532-1-git-send-email-apinski@marvell.com> References: <1669828695-18532-1-git-send-email-apinski@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-ORIG-GUID: O6czcIwZW5125QCjdSXk2hlJU4He1wMh X-Proofpoint-GUID: O6czcIwZW5125QCjdSXk2hlJU4He1wMh 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 So char arrays are not the only type that be initialized from {"a"}. We can have wchar_t (L"") and char16_t (u"") types too. So let's print out the type of the array instead of just saying char. Note in the testsuite I used regex . to match '[' and ']' as I could not figure out how many '\' I needed. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. gcc/c/ChangeLog: * c-typeck.cc (process_init_element): Print out array type for excessive elements. gcc/testsuite/ChangeLog: * gcc.dg/init-bad-1.c: Update error message. * gcc.dg/init-bad-2.c: Likewise. * gcc.dg/init-bad-3.c: Likewise. * gcc.dg/init-excess-3.c: Likewise. * gcc.dg/pr61096-1.c: Likewise. --- gcc/c/c-typeck.cc | 2 +- gcc/testsuite/gcc.dg/init-bad-1.c | 2 +- gcc/testsuite/gcc.dg/init-bad-2.c | 2 +- gcc/testsuite/gcc.dg/init-bad-3.c | 2 +- gcc/testsuite/gcc.dg/init-excess-3.c | 12 ++++++------ gcc/testsuite/gcc.dg/pr61096-1.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gcc/c/c-typeck.cc b/gcc/c/c-typeck.cc index 0fc382c..f1a1752 100644 --- a/gcc/c/c-typeck.cc +++ b/gcc/c/c-typeck.cc @@ -10631,7 +10631,7 @@ process_init_element (location_t loc, struct c_expr value, bool implicit, { if (constructor_stack->replacement_value.value) { - error_init (loc, "excess elements in % array initializer"); + error_init (loc, "excess elements in %qT initializer", constructor_type); return; } else if (string_flag) diff --git a/gcc/testsuite/gcc.dg/init-bad-1.c b/gcc/testsuite/gcc.dg/init-bad-1.c index 0da10c3..7c80006 100644 --- a/gcc/testsuite/gcc.dg/init-bad-1.c +++ b/gcc/testsuite/gcc.dg/init-bad-1.c @@ -18,7 +18,7 @@ char s[1] = "x"; char s1[1] = { "x" }; char t[1] = "xy"; /* { dg-warning "initializer-string for array of 'char' is too long" } */ char t1[1] = { "xy" }; /* { dg-warning "initializer-string for array of 'char' is too long" } */ -char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char' array initializer" } */ +char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char.1.' initializer" } */ /* { dg-message "near init" "near" { target *-*-* } .-1 } */ int i = { }; diff --git a/gcc/testsuite/gcc.dg/init-bad-2.c b/gcc/testsuite/gcc.dg/init-bad-2.c index 4775c48..57fd9f9 100644 --- a/gcc/testsuite/gcc.dg/init-bad-2.c +++ b/gcc/testsuite/gcc.dg/init-bad-2.c @@ -19,7 +19,7 @@ char s[1] = "x"; char s1[1] = { "x" }; char t[1] = "xy"; /* { dg-warning "initializer-string for array of 'char' is too long" } */ char t1[1] = { "xy" }; /* { dg-warning "initializer-string for array of 'char' is too long" } */ -char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char' array initializer" } */ +char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char.1.' initializer" } */ /* { dg-message "near init" "near" { target *-*-* } .-1 } */ int j = { 1 }; diff --git a/gcc/testsuite/gcc.dg/init-bad-3.c b/gcc/testsuite/gcc.dg/init-bad-3.c index c5c338d..c22e8ec 100644 --- a/gcc/testsuite/gcc.dg/init-bad-3.c +++ b/gcc/testsuite/gcc.dg/init-bad-3.c @@ -19,7 +19,7 @@ char s[1] = "x"; char s1[1] = { "x" }; char t[1] = "xy"; /* { dg-error "initializer-string for array of 'char' is too long" } */ char t1[1] = { "xy" }; /* { dg-error "initializer-string for array of 'char' is too long" } */ -char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char' array initializer" } */ +char u[1] = { "x", "x" }; /* { dg-error "excess elements in 'char.1.' initializer" } */ /* { dg-message "near init" "near" { target *-*-* } .-1 } */ int j = { 1 }; diff --git a/gcc/testsuite/gcc.dg/init-excess-3.c b/gcc/testsuite/gcc.dg/init-excess-3.c index 7741261..c03a984 100644 --- a/gcc/testsuite/gcc.dg/init-excess-3.c +++ b/gcc/testsuite/gcc.dg/init-excess-3.c @@ -4,12 +4,12 @@ /* { 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" } */ +char s0[] = {"abc",1}; /* { dg-error "'char..' initializer|near init" } */ +char s1[] = {"abc","a"}; /* { dg-error "'char..' initializer|near init" } */ +char s2[] = {1,"abc"}; /* { dg-error "'char..' 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" } */ +char s3[5] = {"abc",1}; /* { dg-error "'char.5.' initializer|near init" } */ +char s4[5] = {"abc","a"}; /* { dg-error "'char.5.' initializer|near init" } */ +char s5[5] = {1,"abc"}; /* { dg-error "'char.5.' initializer|near init|computable at load time" } */ /* { dg-warning "integer from pointer without a cast" "" { target *-*-* } .-1 } */ diff --git a/gcc/testsuite/gcc.dg/pr61096-1.c b/gcc/testsuite/gcc.dg/pr61096-1.c index f41789c..90ffb80 100644 --- a/gcc/testsuite/gcc.dg/pr61096-1.c +++ b/gcc/testsuite/gcc.dg/pr61096-1.c @@ -47,7 +47,7 @@ __extension__ int a15[10] = {[2 ... 1] = 4 }; /* { dg-error "31:empty index rang __extension__ int a16[10] = {[2 ... 100] = 4 }; /* { dg-error "31:array index range in initializer exceeds array bounds" } */ int a17[] = { .B = 1 }; /* { dg-error "15:field name not in record or union initializer" } */ int a18[] = { e }; /* { dg-error "15:initializer element is not constant" } */ -char a19[1] = { "x", "x" }; /* { dg-error "22:excess elements in 'char' array initializer" } */ +char a19[1] = { "x", "x" }; /* { dg-error "22:excess elements in 'char.1.' initializer" } */ void bar (void) -- 1.8.3.1