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 2DE8A38582A4 for ; Thu, 16 Mar 2023 21:47:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2DE8A38582A4 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 (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32GIi9np008573; Thu, 16 Mar 2023 21:47:41 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-2022-7-12; bh=JY6ESzb1HV1FBzVcPBYqtKVELhmI52WhJDEOmVK5TQs=; b=2jNgrVwgu7Vw1rQdNulq3k67H6oVfrSN1XHfiv5DtaCOsdJCIuKrLlnLIsYOGVxJmLue 6CjRlPTnEZ8HMYRrSitnzeKFqHRo1gq0takVNauyjGdnCupExjA1VnpXlHIJNosn1Bqq sZbuP+sXos9jbLmJ2bb9GRsLqvYNZc4amCX7Vf4D3erTh0lMohAaHq3+lTspdaxZ4ndz cJsEYlXCCdb+KBJCWstH0T0N+tl1BeUx92sogsImRlcmkyxJBSUdiXAxem3KKE1SJSxM BRaAhSKtnPSx8ZhXbbRvyU6PPrYqDG11UKXU6HaK30PhkeIZROzT7l4KNp3sDBouPAVE XQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3pbs262bt6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Mar 2023 21:47:40 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 32GKDnAw023437; Thu, 16 Mar 2023 21:47:40 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3pbqkywv7t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 16 Mar 2023 21:47:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ky8w9Z6dJlkRFgCadFxMlNW2+00GbgiIrdtPa76LzzfBClRb+X1J3ku3edCUCIhnumpAUaQ8HHibzQ+nbCtehoVVrcRIZfzowlMPtztvMnSi7ccIQDU/BmH81EFxswVzBtKllj0VJpkTgHlyKzVtK8vjLldf29ek+yb47YYK+b4vAuWXed5kCKIqUz37Tph0N8X2UDizXOdF+AinhvzBZUHK3oUD1FDnqJrDcSZMftgBGX0YthzK49m6lGLWlBqvWzdgsW6ugDu+fxdmri3WHm4wChrSFhWxMAwxSy4vuMzhOj2v3LIlKfHpqGSMQv34EUJ8C6g01mouYhLEzE48vg== 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=JY6ESzb1HV1FBzVcPBYqtKVELhmI52WhJDEOmVK5TQs=; b=QAHGMQxVT/+f4sXMCFL/gwbn9kO1zQNsu+Js6HU5HAgTzP1QiKg/LfcrTdPoExc8/peyqVpMY1RQI0qxFptYo5f0b8I3kf7q6CQ0bbJC6Mi8ztLZInndmmS4dADji+ao90wcNBr0x0liYEraw/oHvLDl7fwPwEGp3jc7jePb4EZfIBHCwrW+IcnBDbsd1IC+PdKjS0XabBHAZa62a5G0O0/0WQ38owtccOZoWDeSbaUJfLWdkeuKtMWooBIkDMZr5zCrVQ8muLwt6qnnLhUhRRxsgPMFA9ah46wx4qQHpDEjbxAh3iLksHZDBAUbi1fcWnwlsOs1g4BqCkSwt8GlLg== 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=JY6ESzb1HV1FBzVcPBYqtKVELhmI52WhJDEOmVK5TQs=; b=pi59UqbKbs6nf3utIz6SuhV61MKWt6byZXUcc3BEc/XUsYDjdAj6SkyHVuaGvb9JyAg7ZFvcD4gAqvfP+yfd4dQ0rWXah6Ti/gMeD+2R/x/b9c0dZcPwLeUMjtmYkMYSKHyMZf17k1c3ups3MrBftlEbLLLfy0d+nWSPSf+wbgk= Received: from CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) by BLAPR10MB5282.namprd10.prod.outlook.com (2603:10b6:208:30e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.33; Thu, 16 Mar 2023 21:47:38 +0000 Received: from CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::7030:ed2e:20d0:cd5b]) by CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::7030:ed2e:20d0:cd5b%8]) with mapi id 15.20.6178.029; Thu, 16 Mar 2023 21:47:38 +0000 From: Qing Zhao To: joseph@codesourcery.com, jakub@redhat.com, sandra@codesourcery.com Cc: rguenther@suse.de, siddhesh@gotplt.org, keescook@chromium.org, gcc-patches@gcc.gnu.org, Qing Zhao Subject: [V5][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Date: Thu, 16 Mar 2023 21:47:14 +0000 Message-Id: <20230316214715.604671-2-qing.zhao@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230316214715.604671-1-qing.zhao@oracle.com> References: <20230316214715.604671-1-qing.zhao@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SJ0PR05CA0117.namprd05.prod.outlook.com (2603:10b6:a03:334::32) To CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PR10MB4344:EE_|BLAPR10MB5282:EE_ X-MS-Office365-Filtering-Correlation-Id: c6fe7d41-e6f6-4546-a052-08db26680f8a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7yjb61iCzYMYcGRgHc+L9mkPrOKQDHdNaVPB0GvpE7c78o7HG/TrhhW+W/n1elUpXmvVX/1fEd/dqI6+KZNSvejt73MEgZPmnf8avReq125FYEYk2dBR1y9Fy2aTeOpdX27c/vVO4AKdRfudPln0AESPCnSLxAPYMBjoeNnUshVDctf5frxAiIgIJu+mphUxxNKaqYlbkSR0SUUaxFfVvXbmwo87eyC0uQLq2MGnpspXeiJ88GCWs2kkfdBkLzsRgT9DrTj3ZYNZ8lnppIyBS0ewkhwMOExNyXOmqBW+K0LxSIIW2QAqBgwyUeo2P4uicZ4rUEyvz9FYivIygzEcZQetLCZ3lSMjeWD1w/KaaFBQ9JiSRdTgtraXVI1f1NU8y6R+UdEVSBX7f+hi9i0LfmXFUXipctgbCNtRSj3iGSkuGQWFt4S5rsPMC1cASW1ov/VE9uCef3oYqIyn6+90BaJB6uVoBhV5Jqeg77jSECA8aD1AzogP05weWBIcmVZeAb/Vx68MiRzTot93n4ktaYAXARp5ZqhDKSeaOHiIRubATiHK1l76MvpH360ChsHKqA3eZdJ4S6CCJ6+wJz5CaJWpLPTzqO4StKtJYZfZc1bmg601KmvmG8FYpeliCxuB 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:(13230025)(39860400002)(136003)(376002)(366004)(396003)(346002)(451199018)(84970400001)(8936002)(41300700001)(478600001)(66476007)(66556008)(4326008)(8676002)(66946007)(36756003)(86362001)(38100700002)(1076003)(26005)(6506007)(6512007)(186003)(6486002)(107886003)(6666004)(5660300002)(44832011)(30864003)(2906002)(316002)(83380400001)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jlRjWO8BFh4TyxMWhDTA/blwPl9LrPi+ui8rWE0QebUFEqVFfj3cRzapCiEQ?= =?us-ascii?Q?FWnRmTq/KNaZO7+MrZ8pMS3z7pdBIDiMk5k+xTJwtrNmtRIEqjORBpI9zBAm?= =?us-ascii?Q?0IkXUsjYsmtjaShl1aWEDXWkHtHWfD98OpOWHa+qDGn9TxwFIx83jzbZpwby?= =?us-ascii?Q?qz1uHTG9GG4ERxyST1Mo9wgQmH9sfpx03NlHIVVozAo6p0bNJdPcYUgwDvgJ?= =?us-ascii?Q?7xNenuxLe4NIkVMI6IfeFkoNhT5gM0LIB0IwKlOPD19p3rOYuZodwE/kMpXt?= =?us-ascii?Q?Hh9JxwKWWcfDx8peh5/NoicGCmFAZ/t2eWxUuG5B3YalBAmlCLcJt4Mq5qoj?= =?us-ascii?Q?Vi9F7TQwYDhPgUptFccca/EIVo1vEPX2akY3bTlpHk0EUtNXYewjsWlFxNa6?= =?us-ascii?Q?Icd8tt6mqCeQG6qNzGyawxNvGQ/d8l2ioDbtvxIUZQ5nMFaMLNiEHqwdRrs0?= =?us-ascii?Q?kw6/8kbxIEqAalshfZi6B3VQA+z5iRhrQbsUbr4GzOr+kxgBXs1ztHVRaep7?= =?us-ascii?Q?FOgyqq2y382u0o5IpfT4ZuCt/+DAkL3E0Tsxsbtven4YS006WT/ZAkvy8fL6?= =?us-ascii?Q?uQgB+zLTqh/i3o/VuTY0I6o2CAlZdfgHuVa+jFGli/U0TuviOT1Cs6DOTBMd?= =?us-ascii?Q?2QM8D11biwPkCNMUSQCzjsGsGgCUbXKG7L76xNSU8GhZWOHaD0sXbEP2MoOR?= =?us-ascii?Q?i00Dz71Ct+N82l5oObL5VITZDMmukPBSmWqiN9rgBLJaB4kUReY9o831lYgu?= =?us-ascii?Q?FyQ5MNRltn3mAFKFLkm4X/kbYH/rBLow0e/Vz+Azr+N+GquAVfir1lanHsWU?= =?us-ascii?Q?ehEyd4a8hl1ZO1r0iYrKUwex6emmSSUXGdalEyaMMFiEgdugzaNB1cmBGclL?= =?us-ascii?Q?cZchOPUt9H/oVPKnRXw+3yWRKdKU1f6eRp9+wItipze6HI3F6xxLvgKPGyho?= =?us-ascii?Q?o4MaR6ZOwkOAGCWeTwl4dZ1Ecx0M53T55ZqQ6kBNdHlf6SLDmPhuvLktK5Gh?= =?us-ascii?Q?4LCilz2Q2d3Qkwv5I9u4twcQVyAqmzMsi7j0so5VN9+JXGZ6dcefBlhyM5iY?= =?us-ascii?Q?D2yQ5plOAyYYO9zWJ4DWRKUMoBCU6jqMmaiu6pzMiwlSYS++1pjoueQvFBT2?= =?us-ascii?Q?/pfGhbnAfjz4y7A8QTOQgo1pSL+AhsDoWsEQK+pP6jVu+fjK5efoarT5taGj?= =?us-ascii?Q?o8JzeC561B9VJVswvmqCdy3ooK+SdIuK6LlTbDi9NDe9YSYol0SQZk09Gswt?= =?us-ascii?Q?mG2WuceQA6bJK71m6KXZYQzq08JBViS6XvzvZmcNuulXNUhvYSaG7+BnLBPi?= =?us-ascii?Q?uCHjDkwTQrgVjpdYGLRAsHUNpseO+GvWDQwu+Cf8n2Y8/1tsIccdsOzP1bxW?= =?us-ascii?Q?4bIFX9H9B4CO7OeWe/3k3YcmvmEASe4ydSARjgCBHO7hK9dPiaZJ53gKCUYP?= =?us-ascii?Q?w4F4nOEQ0x37VJO3ZDlC1EtaY4QaofyIE2aQIgJDrtvMU9HcqdT5rm57r+6B?= =?us-ascii?Q?/pBzUx9u9cMzBoF+62xm1wPMhLchxl/kuTkdKSwxMKCGYRoAnz5hPq5TvvC6?= =?us-ascii?Q?D8xXFuF2N57J0Rqv0/8fvYWi6n7n5UO5LL69fVqH?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mXUnCC8TCJeOKNjQtQeuWBQLRglUH+bmIRleIepSKUGDuDH2dhCanwR/GBR0PLyGqkaZswT31VDDqpHUQyKSCx1qyljyv8G0QZgFlzl259KP3Kup/5sK8eRlQDPtdEwKL390HQ+3r1MGhIBbyKEPFkSeISUozB2wiXGCoKdFHOmzoFd8TNKGzOh0LVIpKxGrHgxZ5/MqZd6SVeMJDzIvSVfu6sYSSim/HsLJ6tyFDgDQ51qzlIOvI5HNYS5DYDUJDw851A8UBgUx91C6hdyymHAdpRRHpEaeGfGULgxApi2S9LECNJvdyG7c00zobuIg209fuZLVDsUV+qq+GDmbnhjQQmVQdFS0y3MycmngSiNDF/6jicLsuz+LC6DjKylv77oDCuK+VZif7hZxjUADUZN4lOvZcLgikAPWISNcQRWXOn92qWJVtO6ToQMiF1Ub472ru4ICiZAFqnxypmeoJOthOxkmGAOK+Yfe4oevy4OWFMbqo/tU5CS+s+vjPt3yxrhlute0CTcpoihIPkl8UvzhI+Yn+hAtDfiAS9JZOBHBFtBhBuWrxCOgwcgFlIKHri4K6tH7HF9GcRrCW0siMOcYbncrCNvczOEZfzLSi0QN7vYhLeb+G6hHzYVh3UHHQsetpOo2Ljg9PU4xIPGmxtuDLRoLakSzes7SOurlFk1kyYfXeg7/CfubBvE1ij1UVromMtPxPg058uwReAU3c8DhNthZFa8yXFnnAQbpFTLq8I/zRugz5jIxBwbVKVf2+QKr0LrJapQ0vECMlWhdseasF15k6WF/xHDyZn+rUpxJ3wvaj6n3KBYnzABJCPOhTVwuH+MNG++sfg+e/TIJOJOc1dlsLIMcb4Gnff/Yvfr+/vzmnCctO6LXU8kHlsFebvlVZAcTPdlAPFjfSdBlSl2VqBl0QwLAQfjC2Zw4+n4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6fe7d41-e6f6-4546-a052-08db26680f8a X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4344.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2023 21:47:38.3973 (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: fbegpeTrcx9rX6d45zjefgZ8czfEK3jbUlT83AS46q75FSEoPsm+EvxzjCVtxsfHCysUTYOritsng2KS0QqSiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5282 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-16_14,2023-03-16_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303160162 X-Proofpoint-ORIG-GUID: FROt8d0uq0QJOnE99LF5A9z3Bn5XYdW3 X-Proofpoint-GUID: FROt8d0uq0QJOnE99LF5A9z3Bn5XYdW3 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,RCVD_IN_MSPIKE_H2,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: GCC extension accepts the case when a struct with a flexible array member is embedded into another struct or union (possibly recursively). __builtin_object_size should treat such struct as flexible size per -fstrict-flex-arrays. gcc/c/ChangeLog: PR tree-optimization/101832 * c-decl.cc (finish_struct): Set TYPE_INCLUDE_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_INCLUDE_FLEXARRAY properly for its corresponding type. gcc/ChangeLog: PR tree-optimization/101832 * print-tree.cc (print_node): Print new bit type_include_flexarray. * tree-core.h (struct tree_type_common): Use bit no_named_args_stdarg_p as type_include_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_INCLUDE_FLEXARRAY): New macro TYPE_INCLUDE_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 e537d33f398..14c54809b9d 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -9258,6 +9258,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_INCLUDE_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_INCLUDE_FLEXARRAY (t) + = is_last_field && flexible_array_member_type_p (TREE_TYPE (x)); + /* Recursively set TYPE_INCLUDE_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_INCLUDE_FLEXARRAY (t) + = is_last_field && TYPE_INCLUDE_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 882dd8971a4..9dde7118266 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_INCLUDE_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 1f3afcbbc86..efacdb7686f 100644 --- a/gcc/print-tree.cc +++ b/gcc/print-tree.cc @@ -631,6 +631,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_INCLUDE_FLEXARRAY (node)) + fputs (" include-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 fd2be57b78c..1d94c9a8ce2 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -1717,6 +1717,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_INCLUDE_FLEXARRAY + for RECORD_TYPE and UNION_TYPE. */ unsigned no_named_args_stdarg_p : 1; unsigned spare : 15; diff --git a/gcc/tree-object-size.cc b/gcc/tree-object-size.cc index 9a936a91983..1619d144ecd 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_INCLUDE_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 d4dc30f048f..56add06a70a 100644 --- a/gcc/tree-streamer-in.cc +++ b/gcc/tree-streamer-in.cc @@ -398,7 +398,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_INCLUDE_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 d107229da5c..64f6c8bbabb 100644 --- a/gcc/tree-streamer-out.cc +++ b/gcc/tree-streamer-out.cc @@ -365,7 +365,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_INCLUDE_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 91375f9652f..18c9f416758 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 + at the last field recursively. */ +#define TYPE_INCLUDE_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