From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id B2C8A3882006 for ; Mon, 5 Jun 2023 15:13:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B2C8A3882006 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 355C30wY010767; Mon, 5 Jun 2023 15:13:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : content-type : mime-version; s=corp-2023-03-30; bh=UiaktoqvyL1aWsK8kBnHwrV+F6hO/Hh2szlh/bQ9amM=; b=d7jV3E3nfk0BafL+x7VOJ6DqQqkc6n84VpNF6MxXkgp8v+s8F0q/yDqL/UkF0w04p7dz cloVj6HRPdM30fJcEXhNUi9XQwNK9CjBtJY+59a/2wSWYjH2MZcVZvJ0kInUBVZU/2DE pckIGI4UJSaIxTwIzgigK4e4RpcB3nZPPgI+xUdfwC3+9cPhUV09lgfVQeRJ7GqvcU30 aRhKw4VPjcRmdcZwoDsxGoXBUR/Qr745+Xb9TYXvfvTfsuYpEPKK1xEOpx8r/Ghc0UeR uvNgcM+oDztlzw2AtAFtFYTXfshE15Mc8zxY98+yhH0uJeTtjvPL8GKtpvJ8JtUduU9p zw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qyx1nu6h6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Jun 2023 15:13:24 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 355E0PKj011452; Mon, 5 Jun 2023 15:13:23 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2176.outbound.protection.outlook.com [104.47.59.176]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3r0tjy47g0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Jun 2023 15:13:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C7wnLyL04ZEP5NUhudIQCQ3eRLjeyGxElpW/ZDEBcWpwQZqF8hmAd1qF8FjdXIRWcCpJhzJgcYrQkOFGFQJnX61p+cGlMyZPjPgcUD+I/SPwBjBf05gyPBeDj1PQEvwRjZ7bdR7ru4CArSVLGrtGNuUvgwQBy0uvixbVCMdY6HmRE0Y/xNgL4QQtnnPloTNuoYtLivmcjoNvBxsWnajidrudDi4goo54sL/7UaietcCFONOBfkqYCsrIhNv7AGfexIx0c4LL4pBWazCI4Yx77xzwbdkaMufrnjkWlJW+v8Xr+D334cuOTrUQt2Olyq7WJVjHGHUrkCfDpmjT7+isDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UiaktoqvyL1aWsK8kBnHwrV+F6hO/Hh2szlh/bQ9amM=; b=WgE5DWIYdtfiLFXUHRNP++CiG2eH1oEzE7l1NJ3IVc06NsXXLviIYCzNAAboEwKZWW41j//kOkUCBhbZ4dmsIaVLbzTsfYqVSB5e58Z5En0sXMXWgUzk1jj0/Sdy9QH2XImerCGKNpnAK+HfhSzPecKSpsoAhRxMOwBW4RJraUYnv4qDseXKzLkYUXyZoXJlvjV/GESaChK0GJixqwQ7PZpx4KdZFBz8sFn+LAglFEjlScSFr0e5u0Ch39HHWS7AJGWa0tDSXCVtpw2TM7iPH/dAlWA0QarUmvATJV5Nkms/STaZneVjKzitWeo+svwGVL3F3mpBbflBHPEb/dzEGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UiaktoqvyL1aWsK8kBnHwrV+F6hO/Hh2szlh/bQ9amM=; b=IMyyxIQ6Pgw75VkBMTHv5fECX2D6/0BiYG0qU19zCuAAf9o107MDcbq/U1uxnLjvVBbr2qRISdlsXwJi5oAUgTRTIDzzvYlqqhpmO2dOHHjKxFiDBb54c9k4TKHS5VN88a1lf8OuIyM3kVQT7pRzEz4y968htRUvH3AtqVzmp+8= Received: from CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) by BL3PR10MB6091.namprd10.prod.outlook.com (2603:10b6:208:3b7::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6455.27; Mon, 5 Jun 2023 15:12:53 +0000 Received: from CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::180b:c93:8cf6:4d0f]) by CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::180b:c93:8cf6:4d0f%5]) with mapi id 15.20.6455.030; Mon, 5 Jun 2023 15:12:53 +0000 From: Qing Zhao To: Jakub Jelinek , Richard Biener CC: Joseph Myers , Kees Cook , Siddhesh Poyarekar , Martin Uecker , Qing Zhao via Gcc-patches Subject: Ping: Fwd: [V9][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Thread-Topic: Ping: Fwd: [V9][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Thread-Index: AQHZkyTUuGPybjLjZ0KU/kkzNUw/ew== Date: Mon, 5 Jun 2023 15:12:53 +0000 Message-ID: References: <20230530183029.1156862-2-qing.zhao@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: Apple Mail (2.3696.120.41.1.3) x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH2PR10MB4344:EE_|BL3PR10MB6091:EE_ x-ms-office365-filtering-correlation-id: a680beb4-5ece-4456-bd12-08db65d755d6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: scsSFClIPF/HGFQWFrL9pq0oq7ptZBn+xF0Ov1ylTXCbTN8fco/p44DU3hp7Nxt7Gdw1MAwdpqe3t5085BjuhalwydQ2JHts8gpq8lzgnskRcz0w2s23lIVDfHGo8yX6t4jWX334vyF0Fht5CpLGnmGODqdjV88z2pcDWn3eipat7M98VL5+uHsKVC0VPkJEGHxccpwalXTpMCKfXpKBtpn4+Ydj8hwxOzSfp1rVqNbk2DISWMmRsnPzWqvJBVTu5HWhtn0iP2wXAykWXP78IEnIskLg/BSid2z13zKX1cxgQA16MK/NuBdC6toojY2qHZkjY00cQt8ILa4G5/SjRbBfclGEpgUuSgbxoZHfQan9L0xpyfv4udK9d3p0PDgpFgLZFC5NChII0rQaIStB+cGGmsRRVcOY3+m68tmzotHD+3E33xMb350Wl+HUOsFbLh78bCV3+ssmKvDYgWNUiEmGVHix8eGTWLrr4upM14fVXcJdiGoYr1nNP86g2gpR9K/dKycgQoaKAZs3iH55qJ8lzAjEVHYt8R9nrWhf4tjPiNTo7lIyRjg0J6f+5URTTAgoV002PnY+LF0BKB0gYMS1fJgg7LYSJlP3JFobX1063nq+m1msmFhImLthHVUFp441ln0GPVGKdDEMr+f/HA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4344.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(136003)(396003)(346002)(366004)(39860400002)(451199021)(86362001)(33656002)(36756003)(122000001)(38100700002)(38070700005)(166002)(478600001)(71200400001)(110136005)(54906003)(84970400001)(6486002)(8676002)(8936002)(5660300002)(44832011)(76116006)(30864003)(91956017)(66476007)(66446008)(64756008)(66556008)(2906002)(316002)(41300700001)(66946007)(186003)(2616005)(4326008)(6512007)(83380400001)(6506007)(45980500001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?TOXIaEoDB/8dRXHYNI46csBBmJLsvXyE2JZyLHdx8jve6Qe2zE3A1eTRBY06?= =?us-ascii?Q?zmWwmhNVMoEYybzGoB2aXHZwrG+fO9MFxdvznIJuyueV/0Dun9SzJXpErg+e?= =?us-ascii?Q?kG/FW5+04am1U1L1YCkLvl5j6ah2aUlk0DfYBFINH7S6OfKSzSWMJL4fGRXS?= =?us-ascii?Q?3N9ktan09FXvWkOh7oJl5G+H6yVooIOtmqYg3Zjjx2Nxt/AVBX2ce4L8A+Wl?= =?us-ascii?Q?ivNiwjqnYl4pg450Ih6YrTUnmGKpi/FuPMyhkJvZf4GbW0Qy/4KfK1YKfLeA?= =?us-ascii?Q?d0sitWF9si7qPVQNN6qlycMmBo58wfkUvQxjRiXushMbclj81hGKBRM1bg0R?= =?us-ascii?Q?AMM63eQGQmYc1FKwdbfBrxDM6PGIe9oOPWfNSYZlDR9PjHApffyJQjiENJCe?= =?us-ascii?Q?lffDh/kHDvqrPwt80t0xFs+0WQ7qgA85Jt+YG8iO+uJArzN0DBMjgD2VI2nR?= =?us-ascii?Q?nkHzT3itH3TdntZvBTVjd2oSuUmjLdH4A4TzdYEPRPmjn8E+r3/k27qMdJ5T?= =?us-ascii?Q?UKXIVLlC6IQ3jo1/vdc6uVbnqu8IlzFCMb3HAwDxiwvdvU5cXwIVAp646Rm1?= =?us-ascii?Q?3nmUvGd/f3ZXcUVz1M6LzOgofSj1FQ9Fmzk1M7Xk9DVpBvFt3kshVGYp09+k?= =?us-ascii?Q?hatDuwf1lJ32xzgxcaUpYG2v19MXKDTDTQFHnkvRHA2U/fMxhxr3uX7YF1W/?= =?us-ascii?Q?bd34EMB7xCp7O5hTLt1lVDgRW40dPUXbaGv+56nP3cw5PFCSmJwMMkrAtFhc?= =?us-ascii?Q?P7ilsxPXCLUd6THlAYJ/tzYLffPT6uqOlAvGFjqOsCTiEV5mOurHIPBQ6DIG?= =?us-ascii?Q?nqf/T5fs0OZs7YRQgJWdPUrMIu+JLAh/DusDSJ73oYIGrhKHuY3X0YXAqfUi?= =?us-ascii?Q?Vbncc7Jnz6iG+QbrtRHFYbsZMxaRYRsC9o4jyw6N3t1PKZiHw+rRZKmK46Ov?= =?us-ascii?Q?WzgmfF54R42f0AyIZuhNH78Z85cmY80jFGUGRdD56LLFq5p8vMy7RMsxu+JJ?= =?us-ascii?Q?I5Iq45qHsxPk6/cgc15HbbX7ZTXsdl6ATVMe/eNNi0Iqrx1HOJeIB7S5pINm?= =?us-ascii?Q?FZGnAb4mSda4O6K5jtejhE7lhS61+4Czlh2bfHdnxX3R4dJY9NzmVBvk1wdG?= =?us-ascii?Q?SmIeeB+6DhcuCkhTfWK7yf++eYWMSorjuxjaXgfSRVr69XW5uWBZOTV4PZuv?= =?us-ascii?Q?VURb60z0IXhQyxOLhP6nUb+7GQs2XbZIGnpyA+YT+AKW7Rph1LPWtv7g1Ogk?= =?us-ascii?Q?X1V3zJ+33R8qU4vH0fNyp7YJQXZDGcm+7CRxc/lk/YhSLv9kY/HMdtAhzLC2?= =?us-ascii?Q?aG0GIKONBgDEJPyzLXyIpt1jeR+5S+8gxBrcBH9+lcsZvz1akbIooDOjNBSK?= =?us-ascii?Q?lYSEKpJ1hiWaw3DyrkR32j/ZZBOzo98LFkZpk+iQxt03nj/BMCmzvx7KqkhV?= =?us-ascii?Q?Fu+2dEEBp7VC3PF7BG45dAMfvUH7Iz+FFqHUhZTMEGnryFF57hsUa2dP7KyD?= =?us-ascii?Q?NKfdiK340IBwBunofukFUq9KFsHP7/BoVSHerqPuLMg7yiPlMmUydJNabfFC?= =?us-ascii?Q?QbiFGmBW1BqxbXRbXRNO6S6BkLUAKPuR0sYKsrM5rDOZcyDrfKhbAyHEkJjy?= =?us-ascii?Q?G70jirT5B5CZYJz7/kVPhzA=3D?= Content-Type: multipart/alternative; boundary="_000_B81FAA88C26E49BC8938B9A226B33C30oraclecom_" MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?CyD8FRTRoPe5L0pTzom2Bv7F1g+SmFaz+D5xnXLK+FNpmGNAwDoPMtywqJk6?= =?us-ascii?Q?9+JLhYkVKZjwuxNJRhl+7Lb21hf4pbj9OaJm874hlB1C++nW6NCsIZyOvFSX?= =?us-ascii?Q?BECtoFKHo6iGT6c/+8iYY6z9ZBhLhvCk3gMbs7E8VeVZ7bHE0z2xle2fYJXn?= =?us-ascii?Q?5gjOIcGC1p1s7BVjJLdBIQr5zlTOtPCte6pQW6C/0MKP3m0OW1LCiuhXJqbR?= =?us-ascii?Q?FVld1bZjD8gM8fg4nBQQ3UChVWoNGMjTF5GsONYXCQRAxm7zYS6Ywg9rFZB2?= =?us-ascii?Q?2kalzAv6pAIpHlr7cQFD/SEv1cIUh+1uS7r2nBbIad51yQp0nd2CLfhpirzE?= =?us-ascii?Q?3DxZ02gKH1Z4C2lP/RVQsztAS27JOHNS6JcHStJN9au0woVkBNdCHJf2TPu2?= =?us-ascii?Q?QUD6S3gdDC1f9opQNUDqAyQKZ1YRNnPFbxjoR0INGYzCCPDbn5P643iVSVkA?= =?us-ascii?Q?Ty9G8rVjB8E1lQjbHBTMQT/Xrs0ZdI9sjPdEcURwYB9B+hOAel75QBetlyuh?= =?us-ascii?Q?S3+2cexhX/eVWjqwDeyaBvdUBLA066sQsyG4uQh61EG9hfD650GL3HdOExjv?= =?us-ascii?Q?3B4XCGCWpacvyaQqe63yftkm8ND4Qaojv2bBd/qEMIEqskz1BmJZRQXrQPZ6?= =?us-ascii?Q?pHY8B8+as382L8aUBAVu+1Xq5xNoQHETLRFEVRB2ekROifvGYe3v9M1xuZSh?= =?us-ascii?Q?XufJPbUAbDbRszd+QwUAPHHICYHjvXCDzbaPpaU21XMeLcRGAVlzxRqCXoCz?= =?us-ascii?Q?CmpIj4LPjjcidPkhxeYXJoNA8p1YQYbevXebcjyWeNTDFj8UsuseavadsJIH?= =?us-ascii?Q?k93nkxk71tp+wp7/axcl95SI8Y0M/0JsZ+mR5rFLM2PQV+50Z3Aat0qYSvTR?= =?us-ascii?Q?KBOf9RwGO9opmhKQdsH0oX9MXIyLtg6N+fY6UCd1iUne8uAmpi3FedCI6Qh3?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4344.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a680beb4-5ece-4456-bd12-08db65d755d6 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Jun 2023 15:12:53.5123 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: mT/Bn8uTqIiaFt7Okl9O32BIOBeB7PpbYbNkU0gdsV4LB6fnULJsBYNIU5HFEbBGFUeQxIWX3kwuOo8O/TiEWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR10MB6091 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-05_30,2023-06-02_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 mlxscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 suspectscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2306050131 X-Proofpoint-GUID: qH2QTpHxCNKwtejm2CyWt2y1YgFB2yB2 X-Proofpoint-ORIG-GUID: qH2QTpHxCNKwtejm2CyWt2y1YgFB2yB2 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H5,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: --_000_B81FAA88C26E49BC8938B9A226B33C30oraclecom_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Ping on this patch. The C FE and Doc changes has been approved. Please help to review and approve the Middle-end change. Or provide guide on how to move this patch forward. Thanks a lot for the help. Qing Begin forwarded message: From: Qing Zhao > Subject: [V9][PATCH 1/2] Handle component_ref to a structre/union field inc= luding flexible array member [PR101832] Date: May 30, 2023 at 2:30:28 PM EDT To: joseph@codesourcery.com, richard.guenth= er@gmail.com, jakub@redhat.com, gcc-patches@gcc.gnu.org Cc: keescook@chromium.org, siddhesh@gotplt.or= g, uecker@tugraz.at, Q= ing Zhao > Richard or Jakub, could you please review this patch and see whether it's Okay to commit? thanks a lot. Qing =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D GCC extension accepts the case when a struct with a C99 flexible array memb= er is embedded into another struct or union (possibly recursively) as the last field. __builtin_object_size should treat such struct as flexible size. gcc/c/ChangeLog: PR tree-optimization/101832 * c-decl.cc (finish_struct): Set TYPE_INCLUDES_FLEXARRAY = for struct/union type. gcc/lto/ChangeLog: PR tree-optimization/101832 * lto-common.cc (compare_tree_sccs_1): Compare bit TYPE_NO_NAMED_ARGS_STDARG_P or TYPE_INCLUDES_FLEXARRAY properly for its corresponding type. gcc/ChangeLog: PR tree-optimization/101832 * print-tree.cc (print_node): Print new bit type_incl= udes_flexarray. * tree-core.h (struct tree_type_common): Use bit no_named_args_stdarg_p as type_includes_flexarray for RECORD_TYPE or UNION_TYPE. * tree-object-size.cc (addr_object_size): Handl= e structure/union type when it has flexible size. * tree-streamer-in.cc (unpack_ts_type_common_va= lue_fields): Stream in bit no_named_args_stdarg_p properly for its corresponding type. * tree-streamer-out.cc (pack_ts_type_common_va= lue_fields): Stream out bit no_named_args_stdarg_p properly for its corresponding type. * tree.h (TYPE_INCLUDES_FLEXARRAY): New macro TYPE_INCLUDES_FLEXARRAY. gcc/testsuite/ChangeLog: PR tree-optimization/101832 * gcc.dg/builtin-object-size-pr101832.c: New test. change TYPE_INCLUDES_FLEXARRAY to TYPE_INCLUDES_FLEXARRAY --- gcc/c/c-decl.cc | 11 ++ gcc/lto/lto-common.cc | 5 +- gcc/print-tree.cc | 5 + .../gcc.dg/builtin-object-size-pr101832.c | 134 ++++++++++++++++++ gcc/tree-core.h | 2 + gcc/tree-object-size.cc |= 23 ++- gcc/tree-streamer-in.cc |= 5 +- gcc/tree-streamer-out.cc = | 5 +- gcc/tree.h | 7 +- 9 files changed, 192 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/builtin-object-size-pr101832.c diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc index b5b491cf2da..0c718151f6d 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -9282,6 +9282,17 @@ finish_struct (location_t loc, tree t, tree fieldlis= t, tree attributes, /* Set DECL_NOT_FLEXARRAY flag for FIELD_DECL x. */ DECL_NOT_FLEXARRAY (x) =3D !is_flexible_array_member_p (is_last_field= , x); + /* Set TYPE_INCLUDES_FLEXARRAY for the context of x, t. + when x is an array and is the last field. */ + if (TREE_CODE (TREE_TYPE (x)) =3D=3D ARRAY_TYPE) + TYPE_INCLUDES_FLEXARRAY (t) + =3D is_last_field && flexible_array_member_type_p (TREE_TYPE (x)); + /* Recursively set TYPE_INCLUDES_FLEXARRAY for the context of x, t + when x is an union or record and is the last field. */ + else if (RECORD_OR_UNION_TYPE_P (TREE_TYPE (x))) + TYPE_INCLUDES_FLEXARRAY (t) + =3D is_last_field && TYPE_INCLUDES_FLEXARRAY (TREE_TYPE (x)); + if (DECL_NAME (x) || RECORD_OR_UNION_TYPE_P (TREE_TYPE (x))) saw_named_field =3D true; diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-comm= on.cc index 537570204b3..f6b85bbc6f7 100644 --- a/gcc/lto/lto-common.cc +++ b/gcc/lto/lto-common.cc @@ -1275,7 +1275,10 @@ compare_tree_sccs_1 (tree t1, tree t2, tree **map) if (AGGREGATE_TYPE_P (t1)) compare_values (TYPE_TYPELESS_STORAGE); compare_values (TYPE_EMPTY_P); - compare_values (TYPE_NO_NAMED_ARGS_STDARG_P); + if (FUNC_OR_METHOD_TYPE_P (t1)) + compare_values (TYPE_NO_NAMED_ARGS_STDARG_P); + if (RECORD_OR_UNION_TYPE_P (t1)) + compare_values (TYPE_INCLUDES_FLEXARRAY); compare_values (TYPE_PACKED); compare_values (TYPE_RESTRICT); compare_values (TYPE_USER_ALIGN); diff --git a/gcc/print-tree.cc b/gcc/print-tree.cc index ccecd3dc6a7..62451b6cf4e 100644 --- a/gcc/print-tree.cc +++ b/gcc/print-tree.cc @@ -632,6 +632,11 @@ print_node (FILE *file, const char *prefix, tree node,= int indent, && TYPE_CXX_ODR_P (node)) fputs (" cxx-odr-p", file); + if ((code =3D=3D RECORD_TYPE + || code =3D=3D UNION_TYPE) + && TYPE_INCLUDES_FLEXARRAY (node)) + fputs (" includes-flexarray", file); + /* The transparent-union flag is used for different things in different nodes. */ if ((code =3D=3D UNION_TYPE || code =3D=3D RECORD_TYPE) diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-pr101832.c b/gcc/test= suite/gcc.dg/builtin-object-size-pr101832.c new file mode 100644 index 00000000000..60078e11634 --- /dev/null +++ b/gcc/testsuite/gcc.dg/builtin-object-size-pr101832.c @@ -0,0 +1,134 @@ +/* PR 101832: + GCC extension accepts the case when a struct with a C99 flexible array + member is embedded into another struct (possibly recursively). + __builtin_object_size will treat such struct as flexible size. + However, when a structure with non-C99 flexible array member, i.e, trai= ling + [0], [1], or [4], is embedded into anther struct, the stucture will not + be treated as flexible size. */ +/* { dg-do run } */ +/* { dg-options "-O2" } */ + +#include "builtin-object-size-common.h" + +#define expect(p, _v) do { \ + size_t v =3D _v; \ + if (p =3D=3D v) \ + __builtin_printf ("ok: %s =3D=3D %zd\n", #p, p); \ + else {\ + __builtin_printf ("WAT: %s =3D=3D %zd (expected %zd)\n", #p, p, v); \ + FAIL (); \ + } \ +} while (0); + + +struct A { + int n; + char data[]; +}; + +struct B { + int m; + struct A a; +}; + +struct C { + int q; + struct B b; +}; + +struct A0 { + int n; + char data[0]; +}; + +struct B0 { + int m; + struct A0 a; +}; + +struct C0 { + int q; + struct B0 b; +}; + +struct A1 { + int n; + char data[1]; +}; + +struct B1 { + int m; + struct A1 a; +}; + +struct C1 { + int q; + struct B1 b; +}; + +struct An { + int n; + char data[8]; +}; + +struct Bn { + int m; + struct An a; +}; + +struct Cn { + int q; + struct Bn b; +}; + +volatile void *magic1, *magic2; + +int main (int argc, char *argv[]) +{ + struct B *outer; + struct C *outest; + + /* Make sure optimization can't find some other object size. */ + outer =3D (void *)magic1; + outest =3D (void *)magic2; + + expect (__builtin_object_size (&outer->a, 1), -1); + expect (__builtin_object_size (&outest->b, 1), -1); + expect (__builtin_object_size (&outest->b.a, 1), -1); + + struct B0 *outer0; + struct C0 *outest0; + + /* Make sure optimization can't find some other object size. */ + outer0 =3D (void *)magic1; + outest0 =3D (void *)magic2; + + expect (__builtin_object_size (&outer0->a, 1), sizeof (outer0->a)); + expect (__builtin_object_size (&outest0->b, 1), sizeof (outest0->b)); + expect (__builtin_object_size (&outest0->b.a, 1), sizeof (outest0->b.a)); + + struct B1 *outer1; + struct C1 *outest1; + + /* Make sure optimization can't find some other object size. */ + outer1 =3D (void *)magic1; + outest1 =3D (void *)magic2; + + expect (__builtin_object_size (&outer1->a, 1), sizeof (outer1->a)); + expect (__builtin_object_size (&outest1->b, 1), sizeof (outest1->b)); + expect (__builtin_object_size (&outest1->b.a, 1), sizeof (outest1->b.a)); + + struct Bn *outern; + struct Cn *outestn; + + /* Make sure optimization can't find some other object size. */ + outern =3D (void *)magic1; + outestn =3D (void *)magic2; + + expect (__builtin_object_size (&outern->a, 1), sizeof (outern->a)); + expect (__builtin_object_size (&outestn->b, 1), sizeof (outestn->b)); + expect (__builtin_object_size (&outestn->b.a, 1), sizeof (outestn->b.a)); + + DONE (); + return 0; +} diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 9d44c04bf03..b2f619c5efc 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -1712,6 +1712,8 @@ struct GTY(()) tree_type_common { unsigned typeless_storage : 1; unsigned empty_flag : 1; unsigned indivisible_p : 1; + /* TYPE_NO_NAMED_ARGS_STDARG_P for a stdarg function. + Or TYPE_INCLUDES_FLEXARRAY for RECORD_TYPE and UNION_TYPE. */ unsigned no_named_args_stdarg_p : 1; unsigned spare : 1; diff --git a/gcc/tree-object-size.cc b/gcc/tree= -object-size.cc index 9a936a91983..a62af050056 100644 --- a/gcc/tree-object-size.cc +++ b/gcc/tree-object-size.cc @@ -633,11 +633,32 @@ addr_object_size (struct object_size_info *osi, const= _tree ptr, v =3D NULL_TREE; break; case COMPONENT_REF: - if (TREE_CODE (TREE_TYPE (v)) !=3D ARRAY_TYPE) + /* When the ref is not to an aggregate type, i.e, an array, + a record or a union, it will not have flexible size, + compute the object size directly. */ + if (!AGGREGATE_TYPE_P (TREE_TYPE (v))) { v =3D NULL_TREE; break; } + /* if the ref is to a record or union type, but the type + does not include a flexible array recursively, compute + the object size directly. */ + if (RECORD_OR_UNION_TYPE_P (TREE_TYPE (v))) + { + if (!TYPE_INCLUDES_FLEXARRAY (TREE_TYPE (v))) + { + v =3D NULL_TREE; + break; + } + else + { + v =3D TREE_OPERAND (v, 0); + break; + } + } + /* Now the ref is to an array type. */ + gcc_assert (TREE_CODE (TREE_TYPE (v)) =3D=3D ARRAY_TYPE); is_flexible_array_mem_ref =3D array_ref_flexible_size_p (v); while (v !=3D pt_var && TREE_CODE (v) =3D=3D COMPONENT_REF) if (TREE_CODE (TREE_TYPE (TREE_OPERAND (v, 0))) diff --git a/gcc/tree-streamer-in.cc b/gcc/tree= -streamer-in.cc index c803800862c..be2bdbb7699 100644 --- a/gcc/tree-streamer-in.cc +++ b/gcc/tree-streamer-in.cc @@ -386,7 +386,10 @@ unpack_ts_type_common_value_fields (struct bitpack_d *= bp, tree expr) if (AGGREGATE_TYPE_P (expr)) TYPE_TYPELESS_STORAGE (expr) =3D (unsigned) bp_unpack_value (bp, 1); TYPE_EMPTY_P (expr) =3D (unsigned) bp_unpack_value (bp, 1); - TYPE_NO_NAMED_ARGS_STDARG_P (expr) =3D (unsigned) bp_unpack_value (bp, 1= ); + if (FUNC_OR_METHOD_TYPE_P (expr)) + TYPE_NO_NAMED_ARGS_STDARG_P (expr) =3D (unsigned) bp_unpack_value (bp,= 1); + if (RECORD_OR_UNION_TYPE_P (expr)) + TYPE_INCLUDES_FLEXARRAY (expr) =3D (unsigned) bp_unpack_value (bp, 1); TYPE_PRECISION (expr) =3D bp_unpack_var_len_unsigned (bp); SET_TYPE_ALIGN (expr, bp_unpack_var_len_unsigned (bp)); #ifdef ACCEL_COMPILER diff --git a/gcc/tree-streamer-out.cc b/gcc/tr= ee-streamer-out.cc index 5751f77273b..6d4a9d90da6 100644 --- a/gcc/tree-streamer-out.cc +++ b/gcc/tree-streamer-out.cc @@ -355,7 +355,10 @@ pack_ts_type_common_value_fields (struct bitpack_d *bp= , tree expr) if (AGGREGATE_TYPE_P (expr)) bp_pack_value (bp, TYPE_TYPELESS_STORAGE (expr), 1); bp_pack_value (bp, TYPE_EMPTY_P (expr), 1); - bp_pack_value (bp, TYPE_NO_NAMED_ARGS_STDARG_P (expr), 1); + if (FUNC_OR_METHOD_TYPE_P (expr)) + bp_pack_value (bp, TYPE_NO_NAMED_ARGS_STDARG_P (expr), 1); + if (RECORD_OR_UNION_TYPE_P (expr)) + bp_pack_value (bp, TYPE_INCLUDES_FLEXARRAY (expr), 1); bp_pack_var_len_unsigned (bp, TYPE_PRECISION (expr)); bp_pack_var_len_unsigned (bp, TYPE_ALIGN (expr)); } diff --git a/gcc/tree.h b/gcc/tree.h index 0b72663e6a1..d4755317a4c 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -786,7 +786,12 @@ extern void omp_clause_range_check_failed (const_tree,= const char *, int, (...) prototype, where arguments can be accessed with va_start and va_arg), as opposed to an unprototyped function. */ #define TYPE_NO_NAMED_ARGS_STDARG_P(NODE) \ - (TYPE_CHECK (NODE)->type_common.no_named_args_stdarg_p) + (FUNC_OR_METHOD_CHECK (NODE)->type_common.no_named_args_stdarg_p) + +/* True if this RECORD_TYPE or UNION_TYPE includes a flexible array member + as the last field recursively. */ +#define TYPE_INCLUDES_FLEXARRAY(NODE) \ + (RECORD_OR_UNION_CHECK (NODE)->type_common.no_named_args_stdarg_p) /* In an IDENTIFIER_NODE, this means that assemble_name was called with this string as an argument. */ -- 2.31.1 --_000_B81FAA88C26E49BC8938B9A226B33C30oraclecom_--