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 16F433858D39 for ; Tue, 28 Mar 2023 16:02:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 16F433858D39 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 (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32SFxZ0R006584; Tue, 28 Mar 2023 16:02:19 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-type : content-transfer-encoding : mime-version; s=corp-2022-7-12; bh=vjPH9UImP6g8tFlt6t10CLXPnrP9chg8D5QcLcCSKuY=; b=phyXBSy5skqmATdVLgaNAuCiPNZDCi96kA1uZn2rCoEt8WHihk34dL/JJ9CtrLBIx5WG 5021Q9wG13Yn69hJgNe9ZqXd4SZDfp5gSI55/NrciAisBdslYc5qel+/RZX9DX1gS154 GniZVrhxhUgNKUVAEo6oDjy6+MJuaJPHzMptTsJKBjfpg0ewZwpTOUvtFSNeJw64bHQX i+k8AmZZ0IQ1tt34sWdge05zX5b4lNYhxJBAnZYKR53el/dhyI1PtXMLfBn9ywZ9E7AS cPYEbTz76xpzHZK1MXE70Ea6r1crvCfgqDUH9TgPkCPHBqmpyW0VAkOOjYizAVTQYqYN Zg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3pm3byg0ca-15 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 Mar 2023 16:02:19 +0000 Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 32SFLKU5005499; Tue, 28 Mar 2023 15:49:55 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2176.outbound.protection.outlook.com [104.47.57.176]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3phqd6kah1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 28 Mar 2023 15:49:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=erUl00kHpAUf5jVbI2v/edzw5lsI6ivPOjHVjOVwGo2lfwmvHfF+67v1UgnFcgB+s9/+yewLC3ji9rw/qF/7DfrnE1rzKw3C4RzzbD3CJkyZBevXJb0TflAmO28zhiDZkBw5tmTK6bQtCONiXhPJe1NBU1lCdW2P5gN/e40qR9/UyD/aD0sDL/Ge2AJ16J8JKX1mNGwvNq8IvoSkdr9DPQTqBaGTfUD8qR8oik5CUXkMl0RIEMjveh224JZBB7NeCwsq5GeHRVdnTRJ8TbHXHs3IxG5gpZFrDuMXOod/CVX6fEcu6VbVBVZjSgZlvoJI9WZLbBa282YPUtgNi5k29w== 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=vjPH9UImP6g8tFlt6t10CLXPnrP9chg8D5QcLcCSKuY=; b=MihEUvJLlMTvgiK4/+efSMjo0F1mlZCnzn9QlPk6MV2U8ricSMj0nM+DZMmWQ6Mw92WeUPw0Svaah706QimRAYjnwcq0YKrA+GavsOc9iGEkMJcOV/V+abp7+kAm5+Wn4pT6+gIsxQvMkwBA8dftvL3Ypftkokswjuk6LMrh9LRRw+yuvzxqnmiT5qem1soQBUbjkRRwCKjiiF2/wUBJtS7TlSw2l324AQOQ5FKJW8YEoBvcjj6ZSfz0Moiz8bldSUCbFxNh20L71rSOipMypIcmOquOheV1/UTQOh3uGz5/a88EKHuYqZ037IxkgUkkHKJQVwHqgAyLqRjZNyoc8g== 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=vjPH9UImP6g8tFlt6t10CLXPnrP9chg8D5QcLcCSKuY=; b=GUEWX3USu+vpNSmPTkL+rSu4WsKnwCuS2ux19FisoTbFvWF1DhX8ZK8WoUlhjS8zEIWpKt9KNa1Po12kxoPCcz68MhYoF41FtQqwc+2KvpaPKLhTaJ9EuEeNTh9s+fhy3kPuATd8uiSm2bo+MFBXWkQ3r2l84tU9l5tzeSZ82SE= Received: from CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) by CY8PR10MB6563.namprd10.prod.outlook.com (2603:10b6:930:59::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Tue, 28 Mar 2023 15:49:53 +0000 Received: from CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::a33f:73da:f5e2:6c0a]) by CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::a33f:73da:f5e2:6c0a%5]) with mapi id 15.20.6222.033; Tue, 28 Mar 2023 15:49:53 +0000 From: Qing Zhao To: jakub@redhat.com, joseph@codesourcery.com Cc: richard.guenther@gmail.com, keescook@chromium.org, siddhesh@gotplt.org, gcc-patches@gcc.gnu.org, Qing Zhao Subject: [V6][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Date: Tue, 28 Mar 2023 15:49:43 +0000 Message-Id: <20230328154944.3946619-2-qing.zhao@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230328154944.3946619-1-qing.zhao@oracle.com> References: <20230328154944.3946619-1-qing.zhao@oracle.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: SN7P222CA0018.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:124::27) To CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PR10MB4344:EE_|CY8PR10MB6563:EE_ X-MS-Office365-Filtering-Correlation-Id: bdbf8664-aaf5-44fd-7ff5-08db2fa411f5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1p7dVnjRW+ubc/+NtMOEfN082fJZ7w6WLvbwoU4EL3yx9hH+U8m/QUzPKaII/CeAgLgVEPh4CpSfmf6LD5qbEecIUWLqgNqRkDFTeMiXqCqzutJ47OtZnBa6cscYT9yyZnkNelwSnXAWc/MDKToC3Zvi3xFxauBBrTce6cHcymuzLEiBA8ZHMQH0r4X2e+2vKS0N+ENXJolXx7sIHxb5/27JaNwAavH4upKaVC9NvJ4P5eV///J/NsvRgHeKRJ9rDr4FnJneG5xR/aCFycebhgDCM6ENsW5jzLWBuP3hjwyCu/a7rlpggqwiLjvDuCujN2VImLAaoH13L3Hiv1V0hqo8dg7zUiz3VIZHjlqiXp0nC9YtG9gEfVa5FOWa2AZ4eOAB7FxD2wj3QRJEoMx10eXt+hzrMqfBVYjeSiyE3Tv+yGdo3Ry2Y1XIUGfM/ELkGC+riMbkgeixzbYZ+wzEZaa0E/tJJ/eov9UvQwrI/1jLn2VQ8wrQgrOAY/MBdO+gPbrn6yQnFvmletCbqGcvHUSZnMSMlVIBqcGbD4G1S9VE/rChBcT1PDVk63ekDlRCBmXQacIRqM6OiMuP7QHbeg== 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)(39860400002)(136003)(346002)(396003)(366004)(451199021)(478600001)(30864003)(26005)(6666004)(38100700002)(86362001)(84970400001)(6512007)(316002)(6486002)(5660300002)(6506007)(8936002)(36756003)(44832011)(186003)(2906002)(41300700001)(66476007)(83380400001)(1076003)(8676002)(107886003)(66556008)(66946007)(4326008)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L0FaME9IQ1RGSzVpTU9CMnZZT0lGcFNWOWdLclRkYmtoejRuc2NhaFZTR0dp?= =?utf-8?B?YXMxdGxtY2pvQ2tadGVjdlJaVzZOTzBrc1l4NUw5Q2RKZG44OUthY1N3ZWNH?= =?utf-8?B?MjVFQlJlcmRZYzF4K3A4MnFUSlBhaXFlaUM2clZhTkxIUlFlNEdNTFF5azFo?= =?utf-8?B?V0xSWFFGU093THdSNXdmSXJsWlFlUW85S3NmV09mcW5PaTg2REltdFVNWFdO?= =?utf-8?B?d2M4N1d5aXkycUlYbUxpbHZaMnFJUTJlM1JoYmIvaDlPaUEzY2lNMXVtczA3?= =?utf-8?B?c0lVampkK084S0J4T1pORk9IZ3JtWnNGbW91OG5nMzhrSDFnODczRnNVMHhH?= =?utf-8?B?RjFTR1cvK2tMSnJGcFl5aFZkQnhNUDFOY1BoalF5WnVLOEZ4U0k4WWFuNCtn?= =?utf-8?B?K2Z1SzJaTlFCd2V4NFMxYTg0NnVnbEpVbUM0VDhKcm5odFRGWlI0RFgrejRC?= =?utf-8?B?QzdTZzFLNGk5Y1IvN2k4WGRYWmdSTUlUbEthZlVXMXF3RXVCSHdia2J3VC9j?= =?utf-8?B?N3N3UzlVVjhGZFRDTVJtVnA0Uy9CVWFmOWtUS1dQVVhRTkVrUTMvdTRXaDBv?= =?utf-8?B?K0I5a2lEcm9VY0xOdEp3dzBVbTRQQWxKazFMMGlzVkpFWDkvaWg5ZVJGSEh0?= =?utf-8?B?UVpmSktIaUNGS3RwY2NPajZRZzVKdFJKY0lkWXhmQnRPQUJFa1AwYTc1MDQ0?= =?utf-8?B?TVZTUHQ1QUlGU2RSc1U4U0FhUmhyZWVjbnJaUmxGMkRXRlphY01BSWNmVGVq?= =?utf-8?B?a21IaW1CWkFRZk83RFFnZ24vWXdIQUZaV1J2MEV6MksvZ0drMWM2QXhGK3di?= =?utf-8?B?Z0p4Q0EwZEhaRjl6d09nZWZyNWc2RUI3STBBaWE5WXZjUmVjVklrem5lNlZ3?= =?utf-8?B?bzRIMWNzR3Y2Rjlyd25ncHZWeTNvVTJMM0piVkVDZ2Z2Vy9KTXVDUFBYeDVH?= =?utf-8?B?WDZ2NFNidC8xNzRNbWdsWktFa3dZTlMvTXM2V3Y3cUVWam9ZMzFJU2tHNkU4?= =?utf-8?B?TlVvVlE0Nno2d1JVdTUvOFpVWTZDQTBwRDEvSVpaMEovRndkQ3pDbjI1YWhj?= =?utf-8?B?emN2SHBDL1pubzRZZlpzSWs5S1RyT0xLNjRKMzRMYnlWSmhGNTlaRnBhWFJG?= =?utf-8?B?MEF3MEJwU1lQUkl4L3NVdmwwNGw5WEVCempmVmEzbFIyOVJ5UGorQnhueERY?= =?utf-8?B?TWxwdFNDR2g5cEVLa1liNHRCTFcraElwZm0wWWJtK2tRQ1ZDOTJXZDc0cTJC?= =?utf-8?B?VVQwTnBTYWhpRVFGaFBad0dZcUdoTkNkdno1VVJRTEsyTzMzNU40K0E0b2Fq?= =?utf-8?B?Y0hlVzdvN3N3Zm1MMS9IWGp6NjBEU2xET0NyaU8renNMOWxOVWcwejVPeXlq?= =?utf-8?B?bEVEV0ZURTllNTBMQ0M2OWRnbFBtVVhOZHptRWxaRnUrQzk3RkRsWWdIU3ll?= =?utf-8?B?RTI3N3lzYlU3R3RZaHZFZm5ROWdzM2RMenhSWWlSU0Z6Q2ZSdFF4cUkzTXZa?= =?utf-8?B?bWRTR1hta0NPV0p5Mm9zTW9JcC81Q1JuTFNUSlROSDZGWVhSS1BzQnBGV3J1?= =?utf-8?B?cUpUN0dqWU5HU0xFR3EvVSs5WHZtMFJsblJpV3RFak8ranVUV29yeFRlSmtk?= =?utf-8?B?SVVKR2kyaXFHdHAzT1pxS2ZEc1RCMUdkZnl6TktsOVkzSDUvU1owditMbUlm?= =?utf-8?B?R051R082WWZ0a3dUU3VEOTJxY1BTRyswbEc4QWJUa0RmNC9SejFTMU5YUDB2?= =?utf-8?B?SlFWZDBHbkFxUFF4RkFHcDA4MkNyZGtzOXliTlRINmdsb1kyT2dwR0VBUWhw?= =?utf-8?B?eDNETFZsSXczVnRCb2sxbTl1dERhNC9mOUViL3A4eWJqaWcxZmhqRjRuTkVV?= =?utf-8?B?cGRwa2w4eS9EbnV0MmJYeVpKdUJ5UlpNYmFRUHhzUWhMdWtBT3dLWGQxbFBG?= =?utf-8?B?eEZpWWVCd2lCWEFPc2JsOGVuVnB1YjdoVG43aFRuN3ZHU3FPTjR2THY1Wlha?= =?utf-8?B?V0hXUmJEakJPMTZTdmYzazZONWdEQTY0SFVkVHN3NUQ1VTFBbUVodkJGWER4?= =?utf-8?B?VTMvSTJVejUwRzFwSzVtZThBOU5LWkVSOW5WNGxwZU9OWks0b3RJK1loNmZW?= =?utf-8?Q?UVi0V7pZi4XUIWbcfdZLcYZDp?= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cRPbcuS8WFanr5Wd6jUGNC2F2n3RTTsHcsGXoYgOeYYPy82BDTnWEriAfZONkYC+V9MixIYxfk63AK6CYMSBGqEDI40IskPnOYSM/6Q9K9HsuzoFgn3ca3KntiHTskdDZ7iSZnvVGyCZ8UuLJSJ5ZsUNXXTXvHSsm3WjDFeUgQaE1EmTC7ifNSrqLheKFi/TNT7Lk55PJrKssegvqKdadQxU4W1edJjh1/64laeo1zeAQVN3G9q9scERMElH9s9CKOnqwIhj6nOm6/S2Oc3YQcCObX0QMc8q3Pbsp3M7JUoXp6fFdfZlwockbaKbtUVCADyqECzEtGOvlhw24Bc4+jdkU2bcFgFx/1tm0g0hKq3EiTBF3+DoTcxPu56A2bj/6fpQ4cNEyIRXPmtEdhqakf6ewhGZe5VRGIcKVKIwpiqdELhWl/XUdcPd58ZCptlUAqQKMI2cVsvMHWeLtgqGOBu5kgBBseM4l0YAunmqBvI+AJbKzOT+HVBXM3f2xIkSNLaHVgOssBTZY1o9ne7zKIyslvYEUGecu7pcVJQ+kCrt3fzVx5yTdh/w7UkpHLUbcF7SxjVfxTxOA0zAEtvOcrJHiMHwriKsNpY7g28l3rdq0sgtFAJIKUnMW+dOASc3h3CeSj169+zlr5ytnPRiiU7UraZiy/h5tkDhmLd/94aUUsvcpGA1PWLsnwAWNrt34YiDLC9W91i6YI/vcr+GODTpmAXcN0UwWR4hp2/raM0os8bLWwPArGYU7Bhyu4lJvjdf71dfTO0DceEmGCJtJPw97KsGp755DjZ4viHj7X/CSu6kcT6YYsPJUgRh+vTer/JzAppuxmKikCu033B0ul5NVlRNFCJFqe4vv0owE9+rS1+sPmTe7GhqbzolKVc4+xH1Z7Oz4sfrSG4wOSF6BoHzVVg3CznJ1+5Ev1NGlTQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdbf8664-aaf5-44fd-7ff5-08db2fa411f5 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4344.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Mar 2023 15:49:53.0226 (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: w/ZJ0Kmh9XarIt6A455niRFQrU+R2b9wsfpymChYP79cUntY/oLSofMQP4qqZ99Xd0+2dFLgV6vMlencn4GkSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6563 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-24_11,2023-03-28_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303280123 X-Proofpoint-GUID: xh_l1BZsuykmeqpAXdL68mBFPh1ih6gP X-Proofpoint-ORIG-GUID: xh_l1BZsuykmeqpAXdL68mBFPh1ih6gP 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,KAM_SHORT,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: the C front-end has been approved by Joseph. Jacub, could you please eview the middle end part of the changes of this patch? The major change is in tree-object-size.cc (addr_object_size). (To use the new TYPE_INCLUDE_FLEXARRAY info). This patch is to fix PR101832(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101832), and is needed for Linux Kernel security. It’s better to be put into GCC13. Thanks a lot! Qing ========== 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..83482537a6d 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..4a1d481015b 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 abcdb5638d4..3ab3a3a0cc7 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