From patchwork Tue Apr 11 13:37:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Qing Zhao X-Patchwork-Id: 67636 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 785183858404 for ; Tue, 11 Apr 2023 13:37:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 785183858404 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681220278; bh=kUQwVXZ7z+pHzXF+PkTBe6EWZl14ZJkB0DMTj1KnEws=; h=To:CC:Subject:Date:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=aeGK190MOtOQrh0fdi25VZGkgo1JGBEdPZ/8YbJaX1aCaeWvEeFKx+l4H4iHW2BKQ 4oUX7QUxHgsKnYE3uQ7QeqB5+/TTugMjLo6bU+O1fkyjnuquIz+Mcyb3ZxSby0sQCe BWA78qR+QfPuwrRljAxZ9IbU4zdQkQK+Wu0Xsr7M= 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 E113B3858D20 for ; Tue, 11 Apr 2023 13:37:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E113B3858D20 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 33BBNtKt032640; Tue, 11 Apr 2023 13:37:24 GMT Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3pu0b2wdar-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Apr 2023 13:37:23 +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 33BD6kj4030940; Tue, 11 Apr 2023 13:37:22 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2177.outbound.protection.outlook.com [104.47.55.177]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3puwbn306m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Apr 2023 13:37:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eREkk/+m+iNVdUQKW2qSGfigS5xz8LlxQ/c1D14y7LdmYK5ZReufA6h/5NRYc7bYf0L9ssrVqDJD2DYZRl1vjM6RbFIwINH921G1uIJJ6dxMB4xgigZq/q8F1ott6KbJ9pTAWAP10yAO9noQVM8DJN0Cc+dnX5L7StnjCzaylzix1HsR3cw3xliwZMr0mAg93UVBvPN5iNw/FJCMnnXuZkZv0ZUTrYrZifLrWMC0HcnEAsweC8gFA/eXPgRnvPHl3BaibCl9A2nUDTOKN+9mfVilPKqfyLNlvZnWMNmc6QQXbRf3wfcehzew7FJDr5h7JU/YKEFj0tYDIPlUgsK60w== 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=gBsVuUxnZug7j7L41aZaiEmJRA6dgTjHAECssN56sWM=; b=N2EMnW+Pexz6Sk44saZbdE26Ssw6ZoJ1WKdQwEyxSmL4P6nLXtwuk+TTJtIwXMc/neYH0VX0LcoghvHDoLfhHGqKW2erOvhrYTf1HavtNduWq3Md7rnGOd0DzcYFYfVmyIG2PjN7qnj0HWfsztX1A2D11vPni31jBmJZ/2O6jS2yS6sjPpwlzaSo2zVAH9OV5t48tRSiVStz8px5JCWrDW65eAn9WkbKu2aE+fYvqytJH6ZyHaIAMJPyNaw8QCOrubwVl+AtHVUGtG6sNSn5lGhN0EiVA//pkOhZgeFWevD4gxTnVVrrCVEdd/rqMqvfSmkdloCo77fKnFnbHtvw7Q== 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 BLAPR10MB5057.namprd10.prod.outlook.com (2603:10b6:208:30e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Tue, 11 Apr 2023 13:37:18 +0000 Received: from CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::a33f:73da:f5e2:6c0a]) by CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::a33f:73da:f5e2:6c0a%8]) with mapi id 15.20.6277.038; Tue, 11 Apr 2023 13:37:18 +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, 11 Apr 2023 13:37:18 +0000 Message-ID: <9FB1E5C7-4229-49A8-851E-8AC3B38ABC82@oracle.com> References: <4C199CEE-3796-41A3-AB1E-E4CC847888D7@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_|BLAPR10MB5057:EE_ x-ms-office365-filtering-correlation-id: 5ba2b8ea-a6bf-4063-77a1-08db3a91de80 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: HIqwmqJgJV1844SGyVw16aTenzp3fz8YaaOtpj+Vc9piZx6OPziEMgHUtoVpEySkE1Txrv74POz6jX1YVCATCT9bM/AwmjFTYO+L9Ijza+e+ZeANPxHjDtiKe+VBjedsEqw2MLjH2Lw/9Zynd2emnHt7zCXDU621uvFnOeGCeZ5RAJThpYNhokU5jJy1PzgmK6ZnZtw286HP9BQXbeEWB0yjvi/uHhbMciMwFlJSYwGkCsQ6ibOAbf2oICs/QQsoMx0p8ngREQz+99kaL0CfvKXmXjHFl9DJAo7woVEhL5mnoEccKxrMv/65+wQoPbmF95gjZkE3RqmE1DtXE+HtRfL1lj5JEUyOR6XRBlGYIWa/aRejnR7FVSs3Sc4ax/EWvRNs8vMaQHo5kV0mUhDsNHryKF3EhzfavKK/0MTLv99ipxEZ0AFRzXnJrLZd9mBbph8mBokrXlkQeuzJCsLq5arM8sn9R8PBLExmI8M0IPPWdYA3Xcnm9aW/AKKOWQiT07eCtF0IWMEZeQ5NGy5XUh3u6jhnFKBQRpQOnH26AcVwMgLCQb1vEr9t817zDD7V9GorekHdOJWXFvI9TqZSWB1Vm7cZb8jahrI9z5x5fqR11hNOt+IQWdUehlpb55P15NjK/aeSeI61p0mLPSyiSQPn9YkcbxVrcpbCzDp0p3HGXQqs0QB7gEo2fMfFckSm 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)(366004)(396003)(376002)(346002)(39860400002)(136003)(451199021)(71200400001)(478600001)(6512007)(316002)(6506007)(186003)(44832011)(54906003)(91956017)(6486002)(2906002)(30864003)(5660300002)(4326008)(66946007)(76116006)(66446008)(41300700001)(8676002)(6916009)(66476007)(166002)(64756008)(8936002)(66556008)(122000001)(86362001)(83380400001)(33656002)(36756003)(2616005)(38070700005)(38100700002)(84970400001)(45980500001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?ZQD6o89C3qbrrBkao4TwPiQEVrHZ?= =?utf-8?q?3Tvs8NhTYIn674PM6qeI50d0yQB3GRwHRBw+G0wJuoKwcN9PmTsYjQqlEPctzMH2X?= =?utf-8?q?bG6B6CxQ2NNqov1t/E/ueINA3fkRjwmzwuz8F1U4Nm/qUoh0RxYVi2CH7wDijzE2i?= =?utf-8?q?S55ZM/kbGgARjEsXCBPDYCBFRP5f7pZLJjgUsFKyYC85XIRyI3254jYkL2dIXxOaz?= =?utf-8?q?6+vj60t0v9d2GFd665r+vpt2swu/v1J7uPkSHtYuE+eZyvDrS+H4X3Gne24HD1DQy?= =?utf-8?q?Yt4J3sVn3ltk+xA+CrkK83zYJ/ImKr9v1evOfMQDOEWLzPDbhc/ROxTMutfsMCt5f?= =?utf-8?q?EEK5HzfQDaQLZK2GLT7g3815+AqNyt4TVaS7O74s3iLPn3/mszvjnQ/W0EHhBMg4y?= =?utf-8?q?ub9fpbpUHDTtPBWrKLykd0JuNV3MQXvQE/3Y3lIwVPLZ2TMZLkqMnw10q7MYuMEvd?= =?utf-8?q?jLkJNDWnBtAE8m0viX3R0H0poG64/ZnVsQsnOdAQI3xcqlqNmt5k/qMtHXu5gyg1R?= =?utf-8?q?cEhhR9YHFxi07t9mTsgdLehS6Alyl/6KWrsdif3Y58aWdVndADYtDVO2tSWO4qxwD?= =?utf-8?q?SkQr12Dn8evRb9yYgjbW+Rtw15SQn/7BmlmP0SMqZuzdkN1hOU9FyHCxqJnMwCjNe?= =?utf-8?q?wjuKIuINUZ9D119vRDRjSJAwSCKcnRl9MhUfbneWqtmwKt91cibuEg/9jbASALf4O?= =?utf-8?q?iNNjFhk85PsWuyyseR/a9t2+du7U4uuobcJUmoOLWw+MNCeLQO+HGysd5FGQ+Mt/X?= =?utf-8?q?ps241hOUMYlXp6PZdQvV2LnbP5XQmwADVm6vzDBTzaECjqtmt2WuNU53trD+RFWyD?= =?utf-8?q?Ehs7zZ/SwkryBwGPk0oGsSmzdyqChMOavKI4l6Wj/j1fVEoReghcWXuh0l1/NJRxX?= =?utf-8?q?sp9AcLn604s625lw0tdl2Rg4lRwHpIb37og/e+jScXCdYb1+iEo+Ftr6q9IfjO8Ku?= =?utf-8?q?sIUsFKdyV20k626yIfgyHJgFJ/2glBak89jV0bwoOXXbbeqp5P0/KFxORA7/hFmk1?= =?utf-8?q?FPPCSOnfFLqJoDlY0pju7gPjxYMrgMr0932MHOEgXFF7RjiTnOhUXPShRqdFeVYfA?= =?utf-8?q?SDByIQ+W58H1v6Xbb0LY5YPZUr1WJxFb58xym/NF2Nm2aMmqk3aEj1PgsCwxVWAnM?= =?utf-8?q?TQVakhYSUopOzzkv7x1DfsOBktcmvYslGcZN/5sUUW2ceQAx3DtzxxPCPUEsEjO2F?= =?utf-8?q?+c5boalAZmbdMwXExvQvz6oUOn9+9NwRiflwJtTUKKIUWEd3MDFLbv36H6GHF4AJ4?= =?utf-8?q?oznjq4QWfeOIs68LEMwsuO0BUFoDfIRjkkHYpvJ41gPSkPp0ONIE8AbYk90OAfMrg?= =?utf-8?q?XaVaMWn/7mGPViTHFM9j+J4NJMTJdDe8q0O0vCRMZzX2CLV8J/BYj8J6cCT4e4xUB?= =?utf-8?q?HJ+pTDzPQXsDe8akQ5iXgHXv6c72owfUVqpXefoVS0MVUsf4+wDl3q36fvVjUUJ3o?= =?utf-8?q?M2xyDtJXpqdcNs0frbcKvlXcKqcvIR6ri6Vw0ne00Xhm6mOXknDiHmalbeNUVLVva?= =?utf-8?q?yR7MpYt14RTgycn61zLIE6bF15OM+Az3r4LFDGfSk34lkx5gTN7BdUY=3D?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: e9/EXfY+mbOsPaJaWe4m1B4tj1YEGld0lgGxcmolfYLtl0aG4uS+mQzC+1E6z3qcsBjNO7XOkvwuo15DIrDQHiwzfQeJF0i7c4d5r6cXDDUCieRxqBDzmyItL+t/OP6Wkrzj9PBjs3rMIT56kGScuQ/wbfmAnihQdAqb6eMdTkDby9NceSO+f5H5zltz1fXKHHG2vGaBwKphjChrTYNJN4AsZXGy56m9kbif1ltr16hkc1IqFxt4lM2xGidmXtgIRROBdWSTzHPa+BuWsqfqTMaMObmjSvF8RrcTyYtoEIl9wE047nIVz3EIMtGccZC0WjhFOpLpT9Yptcd5aP15CwDTVQ7xEYe1DhP/uLgbh7rAkOdh30PSrO3G7V0EqN25O50nHO3ylN/UrrRkJU4BX+NPMOKRFYJCMngCe1ByJKTuLidnw92W9ojg247Q+AsLnkOfBYOvHNGl0MPVvVMn/Q9hZ4MguNd6zpMtZv6v0gyQNGMNHl/+FxjGnwWrCIHpjkDhf9xa3aSacxOdBWVcJjiTedu+ON8jC8I0JhO8l86mfgqrU4YunlFTdDfLmVxA2ClME9Hpy+2fljFoeITmPv3IpbEMGU9PP3aKHMbh/z6M6Ic5c9nInLa2sTh3DJ0ZcEH2TWRDBjdyiYHThQZ6TbRlDi0xSKFeQG6fS+R5BWK7dNcKLNQxaNSeXTgQ4DQHvbxNO4pLndoJHZEtBsoEAUV4OAbKlxBrvHVlDK/fsmeVfjA2UgwrL2+j1nd1VFuZu5jp7ztiwOfIeC5T2VcZJmD0w5xByO9RL49ytO1FFAZEczZgZqvDMe7vgAYIaQ+XMhliArV7LuQdzI5OQcY8mjRXg9PR0pVcLpO4n4/EZxoRpF/5Ukz+/uvGajOtkEDcu4NMOf0Xd2KtcurbpIcCqB/yGp5zrcbdV9IHS9lOYBo= 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: 5ba2b8ea-a6bf-4063-77a1-08db3a91de80 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2023 13:37:18.0116 (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: aP1QHC8nodLJ6tzfZD0vYcQTG7vr2sG1e3Yv+eySq+CEX8evYkPxbaEGNSFVzHSBV3LXxJ0NgCppFWbnmxDYJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5057 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-11_09,2023-04-11_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 mlxscore=0 malwarescore=0 suspectscore=0 bulkscore=0 spamscore=0 phishscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2304110126 X-Proofpoint-GUID: mI-4X5YqyFubm29RFVwMtEsk2ZVId-6o X-Proofpoint-ORIG-GUID: mI-4X5YqyFubm29RFVwMtEsk2ZVId-6o 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" Hi, Jakub, This is the 2nd ping to the 6th version of the patches -:) Please let me know if you have any further comments on this patch, and whether it’s Okay to commit it to trunk? Thanks a lot for the help. Qing Begin forwarded message: From: Qing Zhao via Gcc-patches > Subject: Fwd: [V6][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Date: April 4, 2023 at 9:06:37 AM EDT To: Jakub Jelinek > Cc: Joseph Myers >, Richard Biener >, kees Cook >, Siddhesh Poyarekar >, gcc Patches > Reply-To: Qing Zhao > 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. */