From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 6DDCD3858D20 for ; Thu, 25 May 2023 01:23:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6DDCD3858D20 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 (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34P1JboE031328; Thu, 25 May 2023 01:23:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-03-30; bh=z9D7/mHeOL3LhRZG0mtHojRVDktfnur/SStlvz5AKPQ=; b=U9I8zJKPO7MRACClb8jbh+OUzQoPukFTh3ByUP799xDgNJGENsPIXPO7/iSDM1GH7RAx w0njWQcbewEWrjKhETp5Ga1KvLYQqmUQjB5Eh544KVhRcA2wi9K1TQBi5ox4bM471NZr zdBG/nUf0sIeN2cgbeIvyUngFHuS9A1/3hPzXFWq5HhqXtumVAE4OBliFwZpZ6UYknAQ UBqXIEVXyfVUB+neXAf0UatEONr+qhnekiZMjg2duSzsYA4DK9zJh3O59uR26z27TIP8 p+5GFPIwcwfXbq5Sv0216CXZYJQ8bN5ig67FXHXFYu9+tofqXzX+/SX9XWL7/BgAwzoH Iw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3qswwk8043-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 May 2023 01:23:07 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 34P0Vvjw028591; Thu, 25 May 2023 01:23:06 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2045.outbound.protection.outlook.com [104.47.51.45]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qqk2t7n18-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 May 2023 01:23:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RUjj+u0piR05/mTMq41X7MXUo+dkYJrAUtVD/aaAimcWNLqpgXCxUdOCPP8mWaKkL9dnvmXYPAxL2MRAFaUrpMUh3yPSvQnEC8s3mxc+zA3Q/MNPyL31lbjiTDk6Za1n8RdJZxelszT7LqN1FoMORkybeb5eMsU5yPI74XL3FB4Dhj/i3WkuaInbvBVe5QcMeombaEoy8f6KtLAgSzc8kKzlmTeLF31t7OXZ+CliBJVFeABQH4Lu6NHEnHLwmexRw3haMToPyWg9I3tfl/D4XuO3ZWDOlpFsK6bbFW1m2lfVbTsbDSsC/q8dtmtbzkAZkiuu4Qar6S2WpjHICXIgnw== 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=z9D7/mHeOL3LhRZG0mtHojRVDktfnur/SStlvz5AKPQ=; b=Ys7IV7h3ztPqXhOVl1zyxENKpGaoq+g6UOAUX22ECCn2+QcCe2/v++c5/r4yU4FRKNJWJ/4AYXli3Ml73f8NV2PJVWKRWdmF/ZstwlOyX1G4GpTd20PZTF+f/9cQ9ADwr27ZyB8Tay8i1LND7W8NJlUTG8QVLbNl1UYMof+DyFpY1X/X8saGs7kZ9lEG/6fVc0h34uTrbmGiBPr/b/IELicHFAUtY0d6jd1krVXcBFsIb8rAScHmEHiZjDHEXjicG6FqEi6SNl7IreQQ1ZVfJYNW/pyEd5Dm1T26ocOjBQIFQ/KbCj957yI2po0fFAWoICYVFCCtEFwQfD1/L8de8Q== 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=z9D7/mHeOL3LhRZG0mtHojRVDktfnur/SStlvz5AKPQ=; b=l+ErpDzNsnV8u9he0d3Qcy3pT6NkENPHVh2fISQAG2z62TCXOnuWNiAeCWUjdW0Di1DSg0wDq0p+VzOi/f/wYip4ZK/td/fWkZm/wu75tS0IOYmPPaGF+FQ1PBm/cyv0kWhT9TCxk1AoazAlhnZsBe/rX9XsAHgkkdy6k3V06so= Received: from CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) by BLAPR10MB5235.namprd10.prod.outlook.com (2603:10b6:208:325::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.28; Thu, 25 May 2023 01:23:03 +0000 Received: from CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::7aa1:df38:105a:21fa]) by CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::7aa1:df38:105a:21fa%7]) with mapi id 15.20.6411.028; Thu, 25 May 2023 01:23:03 +0000 From: Qing Zhao To: joseph@codesourcery.com, richard.guenther@gmail.com, jakub@redhat.com, gcc-patches@gcc.gnu.org Cc: keescook@chromium.org, siddhesh@gotplt.org, uecker@tugraz.at, Qing Zhao Subject: [PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Date: Thu, 25 May 2023 01:22:54 +0000 Message-Id: <20230525012255.2807393-2-qing.zhao@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230525012255.2807393-1-qing.zhao@oracle.com> References: <20230525012255.2807393-1-qing.zhao@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SN7PR04CA0070.namprd04.prod.outlook.com (2603:10b6:806:121::15) To CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PR10MB4344:EE_|BLAPR10MB5235:EE_ X-MS-Office365-Filtering-Correlation-Id: 30656a0a-25f7-4c87-63cb-08db5cbe95d5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IrDLJe1ydSWoQfK4rUmijKb8/4fSivzOCu0kuTMnS+72+xEbUzor/ZYIJLH9U9nt+mNfRX8/NvIv0w1C/IRH2KLL8F0jpI2S16TIaPZXCs159XrkyEhyITWgVg36Qw6nyJM4cwHIVVpeuJKJuOQ+YL3eQyylwCFZMbDWuM6ng2UaYSGDTwjCacG56K64+kECtQKKCA/M/BIHnX7FVYNfVmNYASb6HF/hDRluwpbcHqVH+x+4NAPHqaHcT+hoKCHCc/r4iGMCNrsA0JIa4kzaAQwvXyV2XBF4spICza/q4fxIu9KkyjdcY/LpQjL4zpv6NRvk2tmMc8OQN2BCoZTJfwk206jWdHUAlhhD26CWARGNs+fUCZjRJlC3vH449ho98nXJvidABvp0hfhY/rr14HE/O2N9MBSk+0XY8hwguD3tdTfHm3/HxYQdwSc/LfXWiwdz1ozih8y6NHchnkxv3DWwYkKkQHC2it6tvi9FgD3Ty9LG0mqugxLoYCGjX9iJy6OxW5nNOAez3Yny0tg+ZoYVRmsjxf/6sM0O649ObVU= 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)(396003)(366004)(39860400002)(346002)(376002)(136003)(451199021)(66946007)(66476007)(4326008)(66556008)(6486002)(41300700001)(6666004)(84970400001)(316002)(5660300002)(478600001)(8936002)(8676002)(86362001)(38100700002)(107886003)(44832011)(6506007)(6512007)(1076003)(26005)(186003)(30864003)(2906002)(83380400001)(2616005)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wwJwiZmsWnZiCvY/qVriPSfDVNpI33HXMYJ4sELfXRS5XmcpBFZGVf89dPI0?= =?us-ascii?Q?gX3sATj8sU62Ex5aE6i8Iga4/hcyHcQ8ZppSejHSXBlmMcSELOrrop8nnZAU?= =?us-ascii?Q?rY3/kgrHinQ3SDBe4e9XQQUe/ThR6AqO8jMmUdu6gN3zZSuaMn8pm8NrR3iI?= =?us-ascii?Q?HIbmGYTLQUNgLr9oZPeQ2afuZK2KifEdqLsVG1U4Y4JXLlmrAcUDYDBhpOfy?= =?us-ascii?Q?XgZyYkuk5iumOYrmtAleXcqkvn/+WcAlJNvCu3QRJJwvJ2fR1AGy36he6IM7?= =?us-ascii?Q?4hSM505Q/DexBXgysscGG/VKf0uQYA6r7ERmvCl2eeAKAOLyy3yNp7LLgcnC?= =?us-ascii?Q?04S3ECkri2415pzwqbtkrNzTalkTDjl/nN94AXDqujDq2N+uB6UU8jCZ6e/9?= =?us-ascii?Q?8CAPOADbD/P6L8xpWPSnJEeh8Xv2vd6EFf16Xmji5LmkMBMX1wXtEoNvD1p5?= =?us-ascii?Q?uQlPS5CRzayDe+kZAr1dsFAyXFrCbyZe88HjzDWr0dJElAdpSc3cjf4cA8Vw?= =?us-ascii?Q?3kp3QIJLdd3tRn+mrg/mJ3fN6+cKaPqAZvpYWm5XqBdriWB63rZ4XNPyjiaW?= =?us-ascii?Q?b4K0vr2VvXN4H6E/85ZXIi0JFPIXEEQxcPuiTMRRDQjrvzE0oXElxm52UFkw?= =?us-ascii?Q?pLBwzpD7IbqQDHzqHRTBSNEPJaNu6HkOU108vs1K9ts2iiCrYr0ZMiG5XBbR?= =?us-ascii?Q?TX5BY/P0lg4K8OMJTkQijnc0kBaLu45+RcpyH7aYLAI9tJEeHjQcgxw1k5uD?= =?us-ascii?Q?BRABGK03lUBCmf4Y2bPJ28U3mzDQxPKDRa1yZf7Ei1OwhWnv6K0z/Ie7nTa+?= =?us-ascii?Q?U4xuCFgxca8vmrrW83HOSqXAe0m7y/9IdtYwJkys8f0VflswNSJSs4BBcxaf?= =?us-ascii?Q?hGuaVrdgOpCTjLvCNIB/YQ2xKkOD4ZgT5tgSkx+RTCevAKZO/bI9u6gixRNA?= =?us-ascii?Q?SVwNJCH0LiDCksT697XCnkvb2ja/cc8e9rm2naH6SLDnd57jjLyTPmo2ETP/?= =?us-ascii?Q?+ZNGwFeASeJ6fE1jnfUSRWZDUKHV7GlZOUi1Jh83ukWqmQ54SRuHTT1PRxHB?= =?us-ascii?Q?dA92F6EvNhWmk+seoE+yul8MwI6H8Y68abklhMrw9a6MwXGjVcqv8IPhgGsh?= =?us-ascii?Q?opDIaC2ol6/TuqPObpcpZQ6G+l9hfUzfuAOyKKavMF4Kp52lF1I7O/mo5By/?= =?us-ascii?Q?oeagiA9AzOB/U+hp6mJbcTEdc6sLxDD4+u6wc8sKXf0MBN66vKWC6eoZBR5m?= =?us-ascii?Q?oMo+OtfOrBSqP9c1OWBqhhxO6Yx4ajw3bBKJUJNtxAPUdUFd6ApYnShtnrBx?= =?us-ascii?Q?R9SfrLzlLCVMvVSJTMfUCQcTgimcv9dXGfzNiu6iusKfwwRYdS7ax3sRdIIl?= =?us-ascii?Q?Vwvlbf21jrk2sGeROQJjXO2PvMWtXY6VgJbM8SNgyKsWZQHSUqhdEHmgVhWQ?= =?us-ascii?Q?QoQmJd5jy+FWzeTFd7irWT1rAX5Gpyvaalu3E4J4K95SZRV81riF2vNBH1qe?= =?us-ascii?Q?e6ZxO3a5PwDUM1b6LeQ9JWs+QaSL+Exhrdt7J65oVKp2QB/Y3rTDnPf4O2rx?= =?us-ascii?Q?Mv0seVKZBJCkvQt6/dstPtyRRAQKqq6XmKCGhrZJ?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?6auBKDrAJGbygTUjultJJecAljjfexOass5bEFpDQx2hZN0OMTx47bUPrhXP?= =?us-ascii?Q?fNiVj5M874yQHmoQ7swaAaSPNqqX4k9aaINiY8HgSWhlxgzUvAonITjALxAs?= =?us-ascii?Q?g671OtejKFFGdSGYgdBxzhOd9YsKuhPVcdW0Q++go4JCPcx3bwZxXdDZey/a?= =?us-ascii?Q?+eT4SngBoayotWp8mCoyIEYUTe+xeLiIaEPn2Q2T4oCrll8APm0Vu+1Ho8ff?= =?us-ascii?Q?Z0LaCuAeLCdRQQvbaF6MxH3l/zUJ8IV4QGDV+C+T/Gw4RDZTcGxIOMNNdnz+?= =?us-ascii?Q?8FlPzEYip7zwlVDNX9bEfh7/2tVunpLaT3YJXfKlKdj5KX4nDZRIgzTZexMM?= =?us-ascii?Q?Uh6MW5H7e7GMoxBjd8oVDvE9rUYvIpR+JCOV+r0so49e6kHsu0wG7i8RUOa1?= =?us-ascii?Q?LuZ8WoZgtD0Wf9JoTl1GuoJ7iX0s1aJbQ+4aS8SQ8ALHAiLBxCtaVTavPmFx?= =?us-ascii?Q?U/cFgX/w3hWZO+ECkzZBaKtw/Fw04OP3irylTtpnIUOnT54/fcAWG3L9BR5F?= =?us-ascii?Q?lJe1FwUu1tOu940PtUrpG7OHyLjmvzZAvdDASqapiq/t3CM3mOBP3oxyACXm?= =?us-ascii?Q?+k/2t1UucT3GRUI9mAHD9zr6IB+51xVR8zpVT1qVIVIi/O8D08Yq1x9HoTIy?= =?us-ascii?Q?Ssuil8dKGun2WiW30CM1D1RYIHK5YcS58r7Ejyy5EdgYH2ljJa0GESt6U5D/?= =?us-ascii?Q?Hla378nItVyPEUVrbxWdeeDvIz/OKXAT5+YkyZR84Rdx1FKNT8Y6O3xP05sA?= =?us-ascii?Q?f7nPO+ACDPaiKPeHdhg5ozIqPLlxMDbD5IzhsbrZorlm7Reot+6fwt8hxXfi?= =?us-ascii?Q?1KRTTsnOAGMlaNqpnt1FQFkoelZh8FCAhGGxU73hbl+oeKm0qzm/e48NXuop?= =?us-ascii?Q?KhfDJW3J1QdvMpUqg5vX2mObC6qLVFTMrf/xBVc6R6aj2sHTYlqjp/n1+EIC?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30656a0a-25f7-4c87-63cb-08db5cbe95d5 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4344.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2023 01:23:03.2120 (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: xpEuXWxb0loYkrlKsTb/9t6LMN3ea34mlfxV87PKG5JTQo27laxyrMw5kTUjmmk6rDEhJS39hebC42758bhbgA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5235 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-05-24_17,2023-05-24_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 mlxscore=0 bulkscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305250010 X-Proofpoint-ORIG-GUID: azPXUM-KSHElXtmIvrjhfMNrKLzaVqe1 X-Proofpoint-GUID: azPXUM-KSHElXtmIvrjhfMNrKLzaVqe1 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,RCVD_IN_DNSWL_LOW,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: GCC extension accepts the case when a struct with a C99 flexible array member 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_includes_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): Handle structure/union type when it has flexible size. * tree-streamer-in.cc (unpack_ts_type_common_value_fields): Stream in bit no_named_args_stdarg_p properly for its corresponding type. * tree-streamer-out.cc (pack_ts_type_common_value_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. --- 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 1af51c4acfc..e14f514cb6e 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -9267,6 +9267,17 @@ finish_struct (location_t loc, tree t, tree fieldlist, tree attributes, /* Set DECL_NOT_FLEXARRAY flag for FIELD_DECL x. */ DECL_NOT_FLEXARRAY (x) = !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)) == ARRAY_TYPE) + TYPE_INCLUDES_FLEXARRAY (t) + = 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) + = is_last_field && TYPE_INCLUDES_FLEXARRAY (TREE_TYPE (x)); + if (DECL_NAME (x) || RECORD_OR_UNION_TYPE_P (TREE_TYPE (x))) saw_named_field = true; diff --git a/gcc/lto/lto-common.cc b/gcc/lto/lto-common.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 == RECORD_TYPE + || code == UNION_TYPE) + && TYPE_INCLUDES_FLEXARRAY (node)) + fputs (" includes-flexarray", file); + /* The transparent-union flag is used for different things in different nodes. */ if ((code == UNION_TYPE || code == RECORD_TYPE) diff --git a/gcc/testsuite/gcc.dg/builtin-object-size-pr101832.c b/gcc/testsuite/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, trailing + [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 = _v; \ + if (p == v) \ + __builtin_printf ("ok: %s == %zd\n", #p, p); \ + else {\ + __builtin_printf ("WAT: %s == %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 = (void *)magic1; + outest = (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 = (void *)magic1; + outest0 = (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 = (void *)magic1; + outest1 = (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 = (void *)magic1; + outestn = (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 = NULL_TREE; break; case COMPONENT_REF: - if (TREE_CODE (TREE_TYPE (v)) != 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 = 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 = NULL_TREE; + break; + } + else + { + v = TREE_OPERAND (v, 0); + break; + } + } + /* Now the ref is to an array type. */ + gcc_assert (TREE_CODE (TREE_TYPE (v)) == ARRAY_TYPE); is_flexible_array_mem_ref = array_ref_flexible_size_p (v); while (v != pt_var && TREE_CODE (v) == 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) = (unsigned) bp_unpack_value (bp, 1); TYPE_EMPTY_P (expr) = (unsigned) bp_unpack_value (bp, 1); - TYPE_NO_NAMED_ARGS_STDARG_P (expr) = (unsigned) bp_unpack_value (bp, 1); + if (FUNC_OR_METHOD_TYPE_P (expr)) + TYPE_NO_NAMED_ARGS_STDARG_P (expr) = (unsigned) bp_unpack_value (bp, 1); + if (RECORD_OR_UNION_TYPE_P (expr)) + TYPE_INCLUDES_FLEXARRAY (expr) = (unsigned) bp_unpack_value (bp, 1); TYPE_PRECISION (expr) = 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/tree-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