From patchwork Tue Apr 4 13:06:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Qing Zhao X-Patchwork-Id: 67264 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0BCB03858C5E for ; Tue, 4 Apr 2023 13:07:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0BCB03858C5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680613638; bh=wYGNi7z++AqBIL0dlMiCso4DCry6Qv89TG1ZDt0z6fE=; h=To:CC:Subject:Date:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=i/HcTeVOCjGrfaaTLjFGk0vkiU9EL5GCRzNJ+4C50HBOF972qEwxWuVfKoBzuNV34 k4pxGkFvNBrd9793tLvw8yVJU/N/C//xP1GfCg69Px5tKf5JnSs5NRrCsB0fguhnD7 yE4bW6ZXExJA4LbirBgt6SKdq4iOeqFtaAsO6teY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id C45AF3858D1E for ; Tue, 4 Apr 2023 13:06:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C45AF3858D1E 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 3347WTiL003862; Tue, 4 Apr 2023 13:06:41 GMT Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ppcncwq61-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Apr 2023 13:06:41 +0000 Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 334CcwIn027760; Tue, 4 Apr 2023 13:06:40 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2108.outbound.protection.outlook.com [104.47.55.108]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3pptupt453-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 04 Apr 2023 13:06:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Servkqxrd/3tAHqzNin+4VSKrDWKezVGr7KKlAJCIoI2qtfoc4RneVzc2HB7Yvh46cPJO3Cr6wHyezje7MICgRo+0Cuo3Vzg21jm9GGvGhFi7sSvL63+RtA9POf7ASAYfBcC/EQRvPcTxdIpMgLYk3TrWOoVhYPBobTtj2qrcGMvQoBNW7hc7AjWR6eWXcJ2AgOtyV0pdzJd3nrmBdsl6YeCcB8cEB28RPFnneAiBJuxqTuLCzCtr8yzqnW2q6LZnF91AZxslshESPwhX65FPUdi2Mf7MWfwD+MZtjH9Y4WDNmoYU7gyBzJbPk6HK+ETcDq7fRRU94UW2iGKwT1R6A== 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=kV34i+mvnP1vBzB71ZPUnn888LTKlZIJOyjRKXKzOVw=; b=B2j/BJW4I+SA6azt7mL1ELbYFDVWiypvycG9XZOaaN7U9Z/ZRIooEXIWsmZF/bCreAgtjYzdxy3KelEs2lGqUQ/+QDySxVu44g+jVIVWcfJMndCogaPQ3jt7nS/s8mn7vi+60jaF6Bo0IV6TkFWAT2XDu7moDW+3V1l3eHqDS7rd0OThzr5SI1PYo5HXx+z+QLB2QUYSzg+KlSyyKbHhGZn+9z6skP5JeBoCQIsV5MXoPYtYQ7I4mPb4AwqJZpMwVPMqW8mcbcJqcKDqH9VEtchaHfm5PmnYdQ7JmSW91mR6ewC28wJSXVg5ozufZOkorqH5YDxChByfhQExNhX9Hg== 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 Received: from CH2PR10MB4344.namprd10.prod.outlook.com (2603:10b6:610:af::19) by MW6PR10MB7550.namprd10.prod.outlook.com (2603:10b6:303:240::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.35; Tue, 4 Apr 2023 13:06:37 +0000 Received: from CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::a33f:73da:f5e2:6c0a]) by CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::a33f:73da:f5e2:6c0a%7]) with mapi id 15.20.6254.035; Tue, 4 Apr 2023 13:06:37 +0000 To: Jakub Jelinek CC: Joseph Myers , Richard Biener , kees Cook , Siddhesh Poyarekar , gcc Patches Subject: Fwd: [V6][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Thread-Topic: [V6][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Thread-Index: AQHZYYzv3gONN8NQMky6yn7F/gExww== Date: Tue, 4 Apr 2023 13:06:37 +0000 Message-ID: <4C199CEE-3796-41A3-AB1E-E4CC847888D7@oracle.com> References: <20230328154944.3946619-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.2) x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH2PR10MB4344:EE_|MW6PR10MB7550:EE_ x-ms-office365-filtering-correlation-id: d4ac8cfd-522c-4f22-4107-08db350d6c62 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 1Ig63adLhPCdti9bEns8GBD1wy9QuqdUsv/QDYPnhquma50VrEQTRFutOO+dCvDuSllBytGz0y6jHrTpoeipSTs2j8+PpEVZOuBhZ4thU5rvqRr0oudrgBybUn3JnY8QPuEFcDrD8UodNh1a6Fxuqc2eOvI84goAWyVaKh34qzZgP8HrBmJPXRK2MDfIv7JYuTC0VMgyCbgR9P/RS3YtkAEcKSrk7ca7k7F6YqdFhxvLMJG9ZzDXVn4soW4rFrQ7TuY13KNL0fN1KXAtLx8JaHrnBEFel66mN2pUsL1fh7441YP+2ZCb1Klsqd6bFxegLViCB/usDKdZP1cLlyMlxvPdE/Z36FT3WLMGfM6bfGYjb1lQvkDSS3GlGjkNtXUI7AOs5rJ37GfbLgPfnOUMR9NAk6JdBRUv6hTpoFysDeVTon4dqf/ah/Dlvg167adOPAcs8BM7PoBrApeU6QcJjYUUWyhmu+RTY4RxUASncGBiYWDQjVFfDfPh2uvcPWxuSfL72oDDAE0Ub/lxGhOz7mNRqOBzgcCHgUZf3xid6I+MNPPT340Y0RaXzjHKNKG7b2rCrO+Sd5BnKC2Aiuzn3blI0Q5C2Sz3SfpceZWruLVZKA0aUvl//HVfa6kVn0ewHNMosPHs1Tq2zu/jB4x5ABKqhoBBfB5JIa0Zi0mv1qsloxISgDKLMB3hZt2Du60h 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)(396003)(136003)(346002)(39860400002)(366004)(451199021)(2616005)(6512007)(6506007)(26005)(6486002)(91956017)(64756008)(66446008)(66476007)(66556008)(38100700002)(122000001)(41300700001)(83380400001)(186003)(84970400001)(71200400001)(76116006)(54906003)(478600001)(316002)(166002)(44832011)(86362001)(33656002)(30864003)(2906002)(66946007)(8676002)(6916009)(4326008)(5660300002)(38070700005)(36756003)(8936002)(45980500001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?4JOJV6BVMchEWZe6ch+67eVnypla?= =?utf-8?q?D+JNBXED776Kfa5Q69ZCi9ueZIH12ZOXR6vHJ+q7LtMxgLCyCtR75aIKCaK+lQ3qs?= =?utf-8?q?ut9rheN5UU74eaHNrs/6OYlVsFhRUXq5H59xi1dPrlSiqBb0CG0CzqiowUpHe4ki7?= =?utf-8?q?JC4KZV++m3dNJz4drbq9SSmB5V91AOF6gmx7RqqfhQbOz7p8qt/oPkEceTPoEFR1J?= =?utf-8?q?qghCQ81/jaaGNazGviSbuT2RgxmFKcLk9qBFa+vDeh7A6umVpOObcWREDerWEz2mZ?= =?utf-8?q?eTmJ4GwJIkEx2VKiOjJc/J70svnLY9hkq8dJEsxaKqo836tp6RqBe/8jfkY5Cr8F3?= =?utf-8?q?jAX0yX8pfWP9/yFXDAuLmwecmXfUP+OQGZL+hvYrJTI96ZEUF1tlqsMsAQAyhRcP6?= =?utf-8?q?hw8DXcwGUx0xUR3/leCI0BIUSa0HosxfE+b8RoFu7M/DkC72Rn8/T8o+RROlj2pyB?= =?utf-8?q?HnEwW2OQ7kyYRcTbZx98tEeugKCsMIbaD31tyIAO/2NeZooo/fRifX1RUm3fjZe2D?= =?utf-8?q?ahTTXPR1ErcpSGjDlYAVZ0yHZSsogY4IdVr3FhGXCUL3MnugJnCDSFm2UuSzIJn34?= =?utf-8?q?FeYSJGsfBtwdtSbrkSttJdvZj33lQzLJrxHlz5m/4AFewoiaHI0Fxhmcfsi0JTTBf?= =?utf-8?q?SUFhgGx5dOTeDyceJVKYj2rg4fXP50agidH5pjUWy5YMT6UJdPYQkLtmkndQCcamS?= =?utf-8?q?347Ic+g4tQ38s9j2fW34t9iIsIp0uoGaP6J3qk8QF8A6HHV2AsJU1dA74+cqD/fV4?= =?utf-8?q?E+JIR7ACkB4DIu9hZZnAPkSNMNrYT5N+kV/OdT0Vftlw41yp3QhXDiRm9LXI0F5Cz?= =?utf-8?q?GU8xhBHZOUpIXkcMXtE3ytBaFMXZvH35VU7WeEPsCt4jWE9Xc7sT0/TJgQzfRSL/N?= =?utf-8?q?lqE/2lqV2OFldsztOjEOJcogZqB6XOxs6mhs3iHFKOgyrXoG2SsZoC/+cs33eBYS3?= =?utf-8?q?EEBoiZzNW6+d3fWJ2QmUccmCzsFP0WAUhwt7cPpbesw9e/e6LJHRboMo9dPszLq7J?= =?utf-8?q?rKnazKRRTZrnwpMRs6sQSqh00NuCAjoKz/ockbmNcF7T24yiCLfP9XFp60fXDFHvw?= =?utf-8?q?8VoFpPBFrtDehqrFoCrsFKw7v3ARqnLzxkPhdAkX6VNISGAIGO4rd/U5c4w/OqKz8?= =?utf-8?q?ldoPRus/fTLmN9mcBO2MJ87TTC8gaI3ZZr/VRd2pdW7HXo8U1rvszsxZJ078rVf39?= =?utf-8?q?zvmSUkZ2/bfNepRRiIjsUt+LAsLE5NuG0qpHi4BisZhwsb/IGxFk3361lObJ+DTuG?= =?utf-8?q?zgVIjYBSqeCUDm341H+38pCO0yFEH5Y/okrAjK741jm6oWYB3b8xbxU92AVCjNa6L?= =?utf-8?q?8DaF3Ke1nXjpjjKhMfwL//ZgzbAhB33PmW7yYhNuznqpMYB6o7qepJNHJ2hOiJw4v?= =?utf-8?q?3XBYUA85kd6R0eQuBLaS+JK72SSKzrqyOu7IB11B+OZTihKL8iHFU4CjzI6+//jXT?= =?utf-8?q?5HCNEJPIvqFQ7i5Gx3NsKxWArRhjM1kFwHtuxI0R+3TQDHvZ0CSGfS3U4LCqmxxVN?= =?utf-8?q?98mv8yN6GOPd?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Ms2XfDS8K4oHH7k4xmGz23Z2HKC8LgkHMfta3e8hlMz6jvm/XWbh+GCHjceG+2UlYK4usjx46Ht4n4OSsH59xpXhffio90ghjiTqUmPHMvJ7bgDlS1lwmNwgcrhdHBhgj11Ppy+/Us4sJUeXskjC7GUqVvBj4YEpztv9ZXNJzV1WYFGElsSBg4HYD8LTRfyIootWlPVUB+3Epr1FSHzEvWKW/OnI3brxySpPmotVTM92K508lu/f27ytzBAmxVwVMpwwhLocIXwL6y518CeJfU6YtfoJGZpNOBQSP52oUGia916ZYro8LzK4vz7+bV1iw1hEaTuEqHR5Ennq56+GopAaFg++2IM/uf9RDFGhn/FLXPbpB3W5h6I5VCCydeWyz69cuwsS4TsVbHwaR0ptLdIbkvyQpK6NEApflwPMW0QZNXFDtdlnI/NB2AI3hVv7cVf8QEiekXKlmLhoGJk91hlzM5pVkwETvUYNLzjlNugx5u/eLzKegErBLGG8fkgqUCFPKUpGHFH/TNSQ2X4eVEQXVsopiEudxdUIW+8xDpTYbCPzKdtRb6HozMmVCZhaOL8K403Zd7sTwqcy5785PTGteLCtat0jrR9DLF2DAa+bdaH8HpaL4Tm3UNUnFjruF9BQPefLdwB5z+sABD9Rhkpbu5x8ZAxnPB5Kq28FQYhOldOWLfb/wjuWyobVKyawpddx679BQt6d2LTUYTRz1d2IST33MOiUz7Bt9jLoW+7rYKEUQwwZxfwgl+JDMwTxTeC6OaJ7i9xptdRTAGyJ4R4fFRpkEL1fSzX3IbZz/kPDyVPzXsfbxqqeRY2DiHbU0Vigkua25Eh2/MmIQ77yoB+//cO/IABRI9gD0a388rU9/+Ky/Fz/t3+cL0iqCufPObMd+OpmcIGY8jY40umSVVCg2H1RXdLM69Hs7UA2Vms= 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: d4ac8cfd-522c-4f22-4107-08db350d6c62 X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Apr 2023 13:06:37.1950 (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: nFs+X/9W78QsJCPM/TJ/Hr0QyPag7RkSBwJsHKL0KomVZXQSYyKWnXWObsE7mTALM9EQy21FDTcwFhEy+1nzyA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR10MB7550 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-04-04_05,2023-04-04_03,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 malwarescore=0 mlxlogscore=999 adultscore=0 phishscore=0 suspectscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304040121 X-Proofpoint-GUID: JJ8ryfrimal7gutroqHcrJffcA8E-Y_o X-Proofpoint-ORIG-GUID: JJ8ryfrimal7gutroqHcrJffcA8E-Y_o 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, 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 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Qing Zhao via Gcc-patches From: Qing Zhao Reply-To: Qing Zhao Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Ping… Qing Begin forwarded message: From: Qing Zhao > Subject: [V6][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Date: March 28, 2023 at 11:49:43 AM EDT 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 > 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 -- 2.31.1 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. */