From patchwork Thu Mar 23 13:03:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Qing Zhao X-Patchwork-Id: 74063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2898111wrt; Thu, 23 Mar 2023 06:05:11 -0700 (PDT) X-Google-Smtp-Source: AK7set8njeqw0/7kNMttCcEIl1aTRhDmt4OH2+h8Uqhi9nWI2WQB3mXOU3+lEvizQXeaodzXGGlm X-Received: by 2002:a17:906:391b:b0:92b:eca6:43fc with SMTP id f27-20020a170906391b00b0092beca643fcmr10975714eje.64.1679576711181; Thu, 23 Mar 2023 06:05:11 -0700 (PDT) Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id gv12-20020a170906f10c00b00929d26a82d8si18832635ejb.206.2023.03.23.06.05.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 06:05:11 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vyDOnpDd; arc=fail (body hash mismatch); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D60223857803 for ; Thu, 23 Mar 2023 13:05:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D60223857803 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1679576709; bh=VPqKgF4t2oNJRfSB3goB8t31hRILv26ls0944RNyjD4=; h=To:CC:Subject:Date:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=vyDOnpDdnt751UISUu+kM6ThJK3Mr90SfMAeDmJojWcomR5NJQaoqIWQNQfifSZEE U3j0JvAC5TeTLj6dAtyPNNVlmQBpoVozLRaI2uby8HlfqviH4y8j6/LQxGLI+1QoX2 WZfcpzmHiB3MeLA17EvDaJFWMoRGaVnlWHCewnuA= 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 255E2384600C for ; Thu, 23 Mar 2023 13:04:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 255E2384600C 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 32NCxKSQ020948; Thu, 23 Mar 2023 13:03:58 GMT Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3pd3qdugvy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Mar 2023 13:03:56 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 32NCrhX4030380; Thu, 23 Mar 2023 13:03:49 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2176.outbound.protection.outlook.com [104.47.56.176]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3pgq62gj3e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Mar 2023 13:03:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BTj2oAhviBrEmzQ6Vchop/aIGCC8YzMG1M3qR6FP/qVFgu9PR4WrUpN0nUI9aNogLTYYA5SP8DAfk4WbJtj98lta7E+/TnCzXrIdBLZfe0we98PM2UUhJpz6WjKXWyElknwMj8DDumhNJTafTWdnfB9s6yxe3HyfcHNqnLUDpNPfcCOAkZkahapqa7uemGMyoG9JFD7CyqDhjy6qIrRVbWBXyEIJxEDa/ULovGfyNWxLJJSqi2tfmpTjefTQn3hnOKPbDYHwSpjB9xZ7vYN2/Xfa9bAvwLYwgcsoBS8qw4DwX0GXmpOAZppSIQ8EMZfDvMG9+yt+klBPMXkCv9zxBw== 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=ssRd63m+5srXEQ9v04MW09hJ7XoDIk3ZyLmiW3Wn1z0=; b=dGfLNDtWMJm1T7vpD+HpWorR8pclwwNTeTvu91FmQCWb0I07DliDYPGCX2YY7kXldHI4wyk1fVZSvG6IHrbX4LHLnsJDDSf4H5JHIcYSPCoZWHNR2uRYIUjLd9jFvcm6VodC0riJ/5CSUyUGoG5YzRApvq8FIDNG+bf1bWjirwH9G5+q6yAJIiZQOtZ7cTKLENmT3bGZBCyh4XsedGPk2e9z9ciwSfrVRPF3UepxHZuSdATD5/hE+D0MYmaUBj89gHQ6wQGCllH7f+xUmdwRDTuMUHmQmrU6jDqnFpBoWskwtKeAq+ULlW8k1hrvjjf9JBUFJBYAkJI2JbCGE3rxFg== 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 DS0PR10MB7203.namprd10.prod.outlook.com (2603:10b6:8:f5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.38; Thu, 23 Mar 2023 13:03:45 +0000 Received: from CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::7030:ed2e:20d0:cd5b]) by CH2PR10MB4344.namprd10.prod.outlook.com ([fe80::7030:ed2e:20d0:cd5b%9]) with mapi id 15.20.6178.037; Thu, 23 Mar 2023 13:03:45 +0000 To: Joseph Myers , Jakub Jelinek , "Sandra@codesourcery.com" CC: Siddhesh Poyarekar , Richard Biener , Kees Cook , gcc Patches Subject: Fwd: [V5][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Thread-Topic: [V5][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Thread-Index: AQHZWFDtTT1WMCFiMUK2GNNt6QoVng== Date: Thu, 23 Mar 2023 13:03:45 +0000 Message-ID: <95180085-897F-4B87-BE0E-78ACF1808326@oracle.com> References: <20230316214715.604671-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_|DS0PR10MB7203:EE_ x-ms-office365-filtering-correlation-id: d6d8ce8e-1580-4a35-133f-08db2b9f0914 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9LDwJtkugi8FuUObdRe4j60XtwcDxdJnEc2kSLbayR1DCtAutqWlEBCXuRM8WfnyuEyPs+zzaqQHtKqqL3DIBevKhgEHsySLfmmrwIM5ysSBNhURSamjZwbuOuH/DDi1rQEfHp7cmkf1goPFENRbR6CPknbwTdAW5S91NN3LQdKHZm9ytWR9i9PTVmjh1xmf2F73Ukqrc+9lVSNVpxFonb+yt7nfb+8QH2e5YQWvd2I96D3jYgSZSz2K/2xLjgoWctrWiPSPs+o8T+gRFR+3paYoJYSndm9fLFgjGuzFEP5863EFoyzt/WFQlaIz9XpxNEGVJJxCrIBUGfKWTKkm2u4spkiSZm6aC3OCFzpH6Sy6pB577wFGWvSQTYUw7vQQTsjUI3k7FmhTOFSz0ZJ7TshWxnFNDy1e6VsRtNDcwluuOfl8kWOthdb2WIBuAw1+8jocz3gBuHWNlO82Od/0jZuxTUHoKZR9N6qpxc4J8VExr7axwqesq6pb6ZI/tltdL4/IvrzTGRCxTt6C9wDeGVP31AcOUAC/p9lLOjyo8ESdqm7vJwYC/HrfoxDxiKowCzqmqWgTtvyjAN/zqZT1yxfI/4uscoM5ylEphdP/PSylklcLug0P8VMnrj7STil/19VICoW9XCyY+D+GFCdiU9BlYiven6R0RPX1Y7pMTEO0LYxPdVExHPk/Rbapj8grd1BOS+ckHOqexiZd93A7CO3USFCGmLMbhDM3dhSORv4= 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)(396003)(136003)(346002)(376002)(366004)(39860400002)(451199018)(84970400001)(41300700001)(30864003)(66556008)(66446008)(5660300002)(64756008)(4326008)(66476007)(2906002)(44832011)(38070700005)(166002)(33656002)(86362001)(36756003)(8676002)(38100700002)(122000001)(71200400001)(6486002)(26005)(91956017)(110136005)(478600001)(76116006)(316002)(8936002)(66946007)(83380400001)(6512007)(6506007)(54906003)(2616005)(186003)(45980500001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?WnvmjTNeIr1BcJsbDVLPSlPKvu9Z?= =?utf-8?q?wcjy+IchtR1hTHGUbKiWBFP9BGKKIIHmPnZVciyGGHXBuITMhszkR8FWuHIjpZORP?= =?utf-8?q?cDXTJKtylwSddfIrvgdc37Lz7McUO11LzxifxrWPKavAYTbWjZy6YiKm/ZWZs4WvG?= =?utf-8?q?Xao/imzhaENxO9YkdSs7liIJPfzwxU8lmf4/73C08CGh3l+V/Goab3+jZDwMJc+Df?= =?utf-8?q?HeaYdZQKAF8sTX7+ahh11Xhq9iqATRSzfVm7LhsYtmliTu3Qfj3rru9ish3H0mSxk?= =?utf-8?q?s/gN9s9aH4kioO3AHWCdSnSh8u27qhq/tbfFmYa8dEOy+f8nmblmLFwLXLLc0HD4y?= =?utf-8?q?UI5bNWRtJJFWaGn5jSXjYwJRvem6FpJcCEWEHjdHfLzebtU8La+Fx74NuDjaBTCm3?= =?utf-8?q?txexVZw9Y7TQ/bm/jOB4mFaVKAZQKrCkY4fxIRQMvxZpArgfTFwx5tcxrluM4lB8e?= =?utf-8?q?xULH2e4F1h6kBkeJ6/PA66IbVxwpyLCKfuIyfw8c6TrLNhrMc4EoyEjHODtGEBDCO?= =?utf-8?q?s2jAR7BMJfsW9T4LJ82qzh24vtTJKA4BF8OYVmbsII5nnXe47SMNopwmmKa9XngEG?= =?utf-8?q?+gri9ToM86t2hr6O3L/tTkxA5Ls115pOOcDitIr/Lwnv51gLfNgo/UGVIg6qZWwef?= =?utf-8?q?QwgH0wriuyzR+HydukeDbnnItsPGYFnAJeE6rGBTFlPgSMx1PWRRviQmzppIw5GUv?= =?utf-8?q?Tn0W3otT7RZndUirRe2B4EAmVEJWFzLFXJeV/6RdoRaJDGav54tOngiGqYqjOkb6w?= =?utf-8?q?C18B91XzWAXM3tBjx6dX0ROXJK3g7KayIk4BokKlcgDDwiQkDaT6IMsjKhvHq9C9w?= =?utf-8?q?0JQWvdhV1Itdc6/cmPIGMqfgUga2R9g8YhUxNLvVfyXGNkoU0Ob80bqznVh5d8r9q?= =?utf-8?q?1+Z/WiknUkTiKbjd+OCY0NMH0DH4X8muTJzXawGLBs0JNfoSlPobTh/E4DWImzXbq?= =?utf-8?q?Iw/anhlj6fEn6he91M1yRNG0UDi8tnjV9jP5t4AFa/MLADkXRm9b5MkxWTFP5plaG?= =?utf-8?q?fd7xcZvDnk27yVTJdK42F6pW57hY2IM2TktoN5fnNhmycPZvuj/lsLksXaAHZ45s9?= =?utf-8?q?lUty4gZvdnZiGR5FK8w1/3envLpDItxu0oXOdHEz40T5u1nI7PWRZDrxJdR5Au0Sy?= =?utf-8?q?7B/dBTsyh5RiExbIRmKHmhxbHsmetuZEnHtzPM7UXpzwZguYVoqSIgEfsDodhdAYJ?= =?utf-8?q?bg45qYyPz4mj+v/4HjKNY9sc57dAhOc2+R/QMMjRxiKy4AnXoMIkGJqZOiaK/w+tu?= =?utf-8?q?slWLA5qXi2YqFs+mnablxHTmfUMn5FpduSeiN6NSHKDlvDKkduC3U0owOPraLcK+U?= =?utf-8?q?+TO82vbTFWeP5WL0bBjZ6PKK4baQgCfow39M/tMJwXeP1cTILs5JL6XpQwl+9e6Yn?= =?utf-8?q?pxAcGdQ2dLKPX2eA5qQS1kcs0gkU9zpziPFYeGN7cpxn9BUD5JkWqTOVKzC5pL9KD?= =?utf-8?q?lDDWOzEc5DyXC4rqqqW72sm3dyKIFMaR8eIT2jqV7CXVKGwluBSGyjR59Uxf14o3V?= =?utf-8?q?5nbK+JxdvJ91a5L5tqMRlzNkpprsP65v9Q=3D=3D?= MIME-Version: 1.0 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: T/E9h/6scae+CDGZg4JSC4sI7XErGkRaU1Ee5gCZ1u8kSIbLoy4aA7K+CACq+UhDRZCWnNBrTqH/xg1vsSDaN7rbbtukK9/Bo2hfrUFXpaaDaH/Y2t341B7UByFW/Ho4XXwPN8AMZ0Q3fHDd8C13YW8rq9Duj6hP4NA4Vx5RVqy9n1ec0a1v1Kha3PXB8uYTd4npUB/MIZEwxPRgwhIJY2LpKyet5NGFK4ub4d83TkIyjiNGO/8JCA3GmlniUPj60iQ5i/n3aYXaYp+hdUTS5OXI1ctfIKTcMkdRii0iuQX/C0aceP4KQTXXOApSeF54QkVWX4mKOG265c/6/l9MJgvAOmp4XI6ZwXF6O3cw+n7rnc2x0f/5zuebvfPQbIanKrDCKTeKxRFPx0B2dYINcghXjACwMeJykY4Kl/uAwIfPBRrIoNviYdcrB6RQqjhibtoJzqxR+P7P7t6T+TiOrqLWiGiplfBIPiHzr6W3rW+ZKw6RIYQ27D9UcmegnT6pXX54F0h+G7YxKmW4rxXyUISNp3yxs0nAFADRx1RFR5ad5dtEwtgtfCmnhXU5+7jU46TMjkQM8504ZI9MH85x3lb6JEvjrJINmaOad0LpOIvAWDRqxhixDyjAAEJhux5FMGCpce0CaYxESe+u9yXUT0lt+ASDYllVGwX2Tdc9AcsT/z9yN+zbN67OsxdK1IWeosb0MtR0H2j6caDuPGDBGeu3lkbyi/umMSgACXZ+K39zx4pZ0H6QOH5AIxrxl+vsq+MMn3uVDSzOmX1r/A5563ChpXtmIEMVWj2s4CLmdylZrHWNvdZYUwiL6LLBcbQ8EgUkB4NBYjyc+FUxcfjWovDgySNfP8k1HXUiSpS5WpGbwIOGuNbPm8/BhyQMolJ+Z+IE+iaLAe9U/dNwFIvlzihk/hX07cSjKI1kvN0Ixyg= 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: d6d8ce8e-1580-4a35-133f-08db2b9f0914 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Mar 2023 13:03:45.5005 (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: cEVHpSoOtWyFB2/BGL/Mii0jA0HolVQZMG/Y35bk2yBLWDmFovUBPBfPyP7A9NdNVzRGlEzN0EcKIJQcol9l2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR10MB7203 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-22_21,2023-03-22_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 spamscore=0 mlxscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303150002 definitions=main-2303230098 X-Proofpoint-GUID: WINmRcL5Ta9pPEOXzJr02QS9qOS9dLmd X-Proofpoint-ORIG-GUID: WINmRcL5Ta9pPEOXzJr02QS9qOS9dLmd 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, 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760562597238941442?= X-GMAIL-MSGID: =?utf-8?q?1761163829496287572?= Ping… Please let me know if you have any further comments on the patch. thanks. Qing Begin forwarded message: From: Qing Zhao > Subject: [V5][PATCH 1/2] Handle component_ref to a structre/union field including flexible array member [PR101832] Date: March 16, 2023 at 5:47:14 PM EDT 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 > 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..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. */