From patchwork Wed Apr 10 18:25:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 88312 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 B1FAF395443F for ; Wed, 10 Apr 2024 18:27:28 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id 2BA29394880A for ; Wed, 10 Apr 2024 18:26:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2BA29394880A Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 2BA29394880A Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=2001:470:142:3::10 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712773602; cv=pass; b=Ny6jT8OZOPGvY9kcm4lKc1AWozEKcsqS28UBMGT8U85QgAwIRhvzRUl+4KfTJbHCH/qmAWtFjxrr5vYOSiyjfriynUBmK4WDC/i4PVwCuNDuAC1Ugr3vLadTxi2PkWHEb9okOi9xnAG8lPpwlW05+T/+cEN554+3befYEQh/nf4= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712773602; c=relaxed/simple; bh=qDMCajABeRx9BdDTbyNFG4bHI9ljIBTY0M71EMCeKjI=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=lq2/tfmmK6IYSLZG1uwyQcgTTpH1y/JPTMTnmpF6DFwNtK+Z+NsfaQ/Hk0vcCdoYk8NbuXwSHnZHNTOnypC0jifTuA4Yo2sKaEHhlniZkINhQMWzsvcQbI69CWHWlz7JP1zSgI+WgzqeR6uzlf20CE/K5oP/DQScRfOiSo5/s4s= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruceQ-0008Ou-Lc for gcc-patches@gcc.gnu.org; Wed, 10 Apr 2024 14:26:28 -0400 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 43AHx1Am011909 for ; Wed, 10 Apr 2024 18:25:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=ktY73cvtcCCjl27D591FOD5gqBrVU3X61slY/brrL6E=; b=oYxcf/fTS2jLfAVpPBM962Me3taMvPeKnHrkXCyCwj43ePMT/Qpq6BhH3ioPQgpgoUuV TKrbNzS4iLFmTT5IeFJqXFHJc9819M7D8+aD1bykM5r68TsTy7NBG3mEAozz6QFX8Uva pdTP1r3+OfJUzVqFfDK5ZorgYwHTPP66+DUkyelopaFN5vauXX2abAuvD2adXgwesbJI opC1mu25ns35uY/MhzBGA5wYr4UbW8UI5IaYGVzF6LBhPMgEJ5aYJBQF8WVC2Pisizfb 27X2YIA5Hhk/ig6En8Lx1aitZ2sDsVkrhSyO4s2jRZJSMAbyf2uXM1PPyERqiQ5PdBKQ jQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xavtf7yf3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 10 Apr 2024 18:25:25 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43AHUrQG008024 for ; Wed, 10 Apr 2024 18:25:24 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xavu8hwn4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 10 Apr 2024 18:25:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y8VJBemPrqLcoBo1sA8hHLs7ZC+c6MWA6UTFVjIIBJUBy1r8rSGpK2zLWcxB7yS6bTN+3ZcjGFri/Qzj78xuMAWCwPUjSAE1EXMsvubLA4YsLAtOPiPqsF3ieTjepf1sC/9Hutc35E3AwH2vnMENeCbprvc8ocmZS3CI9xZ8Ndc7A4vqAKTRQmx+cFimbPM8VrL9BpFlQ5som5k1TNpyzhlPypzCVX4OtCE5iTb01vBjso1pkC9kTujwPOjs9PfHxqB96sSuvFYd1npaIbdtuciR6xyPuuql2zyQYmW7ozf1wyuEDJkZ5M/bI/4l5O8ewPsu7+KCp9ad9S8ZSCjsmg== 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=ktY73cvtcCCjl27D591FOD5gqBrVU3X61slY/brrL6E=; b=UX3rtYr7HGXZsUYyOCwBuueEqM49SNPjEqnGNE5tF3X3Y90SZMGBAzLgJMI1qx73RIjzRtiWITslRS18k+L0H9Iq0uCwcFkQ0PhtPkd7939obHt1Ei0dHSlxD3fjHDr0QHZT0Qbtu7x6Dqn0WGkTUDeBCJRLkyUcDLx4+sBnKn5387dCXLELpACJUokP7JhnxJJUiBUiTPdiPp2GeRxn9q9pXythDxEQZ965mH0V6k7rWkXsgU5tRdflU9SzhqF/GE3QoeX/RzFxXBIYIxY0T3lgKLZ4jNbWZbvoQfmz9ZeKgrRXDqYy7/S0Swznep5owtWiXY5mHdUEfnTAVlh8lA== 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=ktY73cvtcCCjl27D591FOD5gqBrVU3X61slY/brrL6E=; b=TkgWjJqEvDGHgudQgeX2NQq0G5bzjBETdkUtK2gRpxr3v/r/z3/rxRTGHsXh8XLcst5NgOVSTPGG3TO4WqHGpYzu1jaYwr1vLquCErjyOEvybrApUpEifpsR8moj9b9J60bPo2CSbD1L/+BZ0p6lEmt7QUof7YMIdW7vlHPZ11U= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by PH0PR10MB5548.namprd10.prod.outlook.com (2603:10b6:510:db::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 18:25:22 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::6ae9:dd4d:17bc:4f2]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::6ae9:dd4d:17bc:4f2%7]) with mapi id 15.20.7409.053; Wed, 10 Apr 2024 18:25:22 +0000 From: Indu Bhagat To: gcc-patches@gcc.gnu.org Cc: david.faust@oracle.com, Indu Bhagat Subject: [PATCH 1/2] ctf: fix PR debug/112878 Date: Wed, 10 Apr 2024 11:25:10 -0700 Message-ID: <20240410182511.1528093-2-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240410182511.1528093-1-indu.bhagat@oracle.com> References: <20240410182511.1528093-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MW4PR03CA0312.namprd03.prod.outlook.com (2603:10b6:303:dd::17) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|PH0PR10MB5548:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kzvNh4icBHxPGZGqAA+p3aspU3h6Hdt30rTm5LPzecgBxwiFv+lH6hVS4/ZcrDq+fOm+JrKDztTbWoG9EpjFP655lY9MwlcKFeRJPsXI64wdKGrA/GYfxRDLyGDHC/lKWMa3B4usNxSVfZJM3IO+H+XYlRyI06kG6kgLt+AZOlwozP39zvHPEmvaCwmiUB/DYM10Yt7Wlxbxb2BUfdqUqkNasmB3ymRiIngkpuH3fCNfI3C+tvEteq8EurKBrmyC0MtHyuzbbmznegM2rYGVlpaBNNIlAvYJEeBfD3e0xpRp/inm+RMSfAGHAkgQrqhPPIdk1Sz6boKl13X/hyX7oMAFpxRQPRyJx3lqaRpd8ooxZRX/jNkGY4ZUPUCTt7fxaIXvy7txG46vi54UFs0eKAKKH4aOA8h9pcD07jz75+yRlLb99AenHXMp7cOvwjGQ/AmMftGI0tLBBlS3eCyscSBJp1rWiNPTT0D53meyo6kAceRqdBBHGFDrFdcVLIRVj2AJBsEhCGCc1czaoO9pF53KqeNvZvj+8Q7ZqKgVTNdwGw2/6aU4ZbVYAq/++fbimL7nvaqcUdir2MgrXe0u0Og2x315i9VQaI+kGu9C0eU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1001MB2158.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(366007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +SsPncILylskR9UrJpJPDrXIA/reD/KT4uwoGJX89QZWU0UjI68LVQThcJS/YvEywQsb1Hf6tj5IjEA90BevjIGYQBUYeAK7Htf9keR3V4f0rD21c6Vdvgn/fqbJl5+GGjtMKFq1UiWAMEv4rx+FDFiuOwW/sa/xZVLWOh91QlV4fnOcVoTMY2absEfzZ9qfxVZrhg/HtWnOnKEmMKmSLJf64WGHfiaB4a1Okt5mmnPpFwBSD5yYCV+nNV8dyGrllniRTjUmSvqc0k6O4qbAVKB/ToaOQAIqBZcxF60klqKLKirZ8IoRb01MLhHOtVnUl83QenF5K5OqbH+YxnJL68qCGn/TPDAjmwYUMRgWpah1m29DjnagzM1t9G6YM1Fz+bPKc0g/nEmD31UsFRcw2polcaFAV6iXpBIPpeM0f31PGy6lL3hDUVyfy2VC0WAKTKVIHH+XB5U0IbywHTmzugZiaqwTKG3XfCLo+6pGY/45S+WmhUdBjyyHwPAg+Z/kqZx2EM9X1FE9GnNZt/X1UhiUepXu2JlBGy83HI089wAKg/W9yr552HsKpxfq+T8DTUcpG506KQQLg4avKmOx+qP4gL6WqDChyqq6QruNh5x/gKS0eZiJ52lQya7xWZlKuDVlA3k8Z1xEudJ8H3WMkf+ZlQBYItiVYfEl67Hc5CA7pTV17QRnM+ab/MB/yjvsEV3TLyRN9EA2irt5vP7lF3W6EYuM5uYRQdnzx3/uxkRVGJo6HdyGq3/IwC3SIWO3c+5rJCNFMjXidCjh+3xsThezUymZnUg8QRRVlbV+tW3dQZqS1nmxHQwTbPejZKH+tbRVyPfUhVis+2rzUx8Q4BmzKdMJ0lofbos1PhDV6gbVJn1LJJxm5SuchblW1c81sFrjFrzwthjJdzpMrYVarWNPTqA41FPceO34/BpTrn01DHfQZ7PNMxClVzIn1Kv2lZVxtS0ee4mARIUZfkDu7WYdZf+rosh5Oym8kJ321F8nK8wMRiwtU+C8cCw0xEPWKIdYXzUb9RefmhExlDq+cTlL2KmWxoerIN/q1Ki/0Brn9DefO8xSYDyA/hEdT7ShfozOJoTkkYsVPkGxf0xO/JBLUFwGon/b05QvZku+dpQA9ImdCIKxlAjUkCMpojiXuDfx/mCbbGHmvMfRfxQ7QITtXz/A1sm31UNZNbukVTWq2W9xsC4EPEaszckk8PULEJfxMA8UF7Uh++W609M1YIB/LVxJsD+KHe8tIsqdkusa+ciDxpHdm+Vnw7KTY62BtA78sF1vMlvNQV67Rok6jbVgT3uZseij4Wh0lGYd+fj+v3591KF+dYdO+jrrv9KUzyjLGK1m1n1RvFEqgQJbaRSmEvxFBJkhdMsVePLTcUsser36f8nV0hrJx9aioP81ubalfzfRl14RlO1lqMSLN6Uxga1VSkX+xOjD3uX0N5zNDpEdJQhZ9cHHiilvlDHyHr8YxKbhxE8AYL6rL/KTInjkyp3kBL5iV2x/vWMd6hJwYU4gMruL+o2Q40DEj4D+tOuMs6AgMRRlHlhtzOGiz3pIGUWj6AgVQrk/0UWQUEXjXYsCcc98vWNsXGY1SLLAtQjYR8mDz/UMreykcXf7b1RILdlRm3XceMAaAVih+OQ= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9reqtgH5AsiJ83g9TcrZlMwSCw5vcdKawMhWLU7pQBVnOgi5jpvk++35mLyVredRtZA7KvUmw6324Mn02xSYSb03PDrJeQoVMqrHZEd9Ipex/voy2XD+Hw1AQnFJmF6JttUQyPZQqDXFPm6m9C/LmWC+hbKxkPyi07fDKGR2cKaGxsTiaZtM6kjhzAbKcLgVIAfLu0D3kCbxokawg7P3fS8iF/14hnhsgSIw9cwrSKtn5wL8fsmpoDMfxo01m8VPDcJASy2rjWCivjxJ8uKuupNm638s9I+gVXssq9eiIkf6t7DgCPXOMd/zVVuL3vuVliC1C4cy2ztrq8BCTBpaOCJCJXrJskEZmhQnVB97H8Qr3l/53DqG0qYKOBxE95/mJvebw8B9r8tiqfpf5tJrevyDsMcVz1lt+dG+qxkcVnaNfReoq50bIUED0PhDae04qlXQxWEz8xUi6Zpi6ZfS6E6xg+OA1P7MQWFyJ0oshSgh13N+hwU91CTKfuFzkXcCFDU8wVhiKmlUmlM+A5GhB+X0J2HNwELRRQ/mgO9olK+ZtlA+adDGAHWeUFGH+zo3cd6n+c5QQsIDdmP22oG79AvBvjjV/SN9RCkxMcqXQ3g= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4b3957d-45dc-43da-40b9-08dc598b953c X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 18:25:22.0354 (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: fep1FEamfQXmiNsTujGF319va985b18ZpxWoTQZwuAuxiM66Pw5ZclV7c+8zi4RxATvxbHRMwteh81aLGZ3Rfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5548 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-10_04,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 mlxscore=0 adultscore=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404100134 X-Proofpoint-GUID: nF6FhxIFpj9BcEndQK4s8GmmftrhqeVM X-Proofpoint-ORIG-GUID: nF6FhxIFpj9BcEndQK4s8GmmftrhqeVM Received-SPF: pass client-ip=205.220.177.32; envelope-from=indu.bhagat@oracle.com; helo=mx0b-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, WEIRD_PORT=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, SPF_HELO_PASS, SPF_NONE, TXREP, WEIRD_PORT 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-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org PR debug/112878: ICE: in ctf_add_slice, at ctfc.cc:499 with _BitInt > 255 in a struct and -gctf1 The CTF generation in GCC does not have a mechanism to roll-back an already added type. In this testcase presented in the PR, we hit a representation limit in CTF slices (for a member of a struct) and ICE, after the type for struct (CTF_K_STRUCT) has already been added to the container. To exit gracefully instead, we now check for both the offset and size of the bitfield to be explicitly <= 255. If the check fails, we emit the member with type CTF_K_UNKNOWN. Note that, the value 255 stems from the existing binutils libctf checks which were motivated to guard against malformed inputs. Although it is not accurate to say that this is a CTF representation limit, mark the code with TBD_CTF_REPRESENTATION_LIMIT for now so that this can be taken care of with the next format version bump, when libctf's checks for the slice data can be lifted as well. gcc/ChangeLog: PR debug/112878 * dwarf2ctf.cc (gen_ctf_sou_type): Check for conditions before call to ctf_add_slice. Use CTF_K_UNKNOWN type if fail. gcc/testsuite/ChangeLog: PR debug/112878 * gcc.dg/debug/ctf/ctf-bitfields-5.c: New test. --- gcc/dwarf2ctf.cc | 15 ++++++++++----- .../gcc.dg/debug/ctf/ctf-bitfields-5.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/debug/ctf/ctf-bitfields-5.c diff --git a/gcc/dwarf2ctf.cc b/gcc/dwarf2ctf.cc index 77d6bf89689..dc59569fe56 100644 --- a/gcc/dwarf2ctf.cc +++ b/gcc/dwarf2ctf.cc @@ -606,11 +606,16 @@ gen_ctf_sou_type (ctf_container_ref ctfc, dw_die_ref sou, uint32_t kind) if (attr) bitpos += AT_unsigned (attr); - field_type_id = ctf_add_slice (ctfc, CTF_ADD_NONROOT, - field_type_id, - bitpos - field_location, - bitsize, - c); + /* This is not precisely a TBD_CTF_REPRESENTATION_LIMIT, but + surely something to look at for the next format version bump + for CTF. */ + if (bitsize <= 255 && (bitpos - field_location) <= 255) + field_type_id = ctf_add_slice (ctfc, CTF_ADD_NONROOT, + field_type_id, + bitpos - field_location, + bitsize, c); + else + field_type_id = gen_ctf_unknown_type (ctfc); } /* Add the field type to the struct or union type. */ diff --git a/gcc/testsuite/gcc.dg/debug/ctf/ctf-bitfields-5.c b/gcc/testsuite/gcc.dg/debug/ctf/ctf-bitfields-5.c new file mode 100644 index 00000000000..fee8228647c --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/ctf/ctf-bitfields-5.c @@ -0,0 +1,17 @@ +/* Bitfield where the bit offset is > 255 is not allowed in CTF. + + PR debug/112878. + This testcase is to ensure graceful handling. No slices are expected. */ + +/* { dg-do compile { target bitint } } */ +/* { dg-options "-O0 -gctf -dA" } */ + +/* No slices are expected, but a struct with one member is expected. + CTF_K_UNKNOWN is also expected. */ +/* { dg-final { scan-assembler-times "cts_type" 0 } } */ +/* { dg-final { scan-assembler-times "\[\t \]0x1a000001\[\t \]+\[^\n\]*ctt_info" 1 } } */ +/* { dg-final { scan-assembler-times "ascii \"unknown.0\"\[\t \]+\[^\n\]*ctf_string" 1 } } */ + +struct { + _BitInt(282) a : 280; +} b; From patchwork Wed Apr 10 18:25:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 88311 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 558A53953831 for ; Wed, 10 Apr 2024 18:26:19 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 0CF2538A90BE for ; Wed, 10 Apr 2024 18:25:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0CF2538A90BE Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0CF2538A90BE Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712773543; cv=pass; b=c7XmH6ZUjsh2xRV20RjA/AY8/S0HmANKlO/I4dWXJSzEvmVrvvS78ehZiyrseKIxujoSGQ8CoFPpLexiJMF+ZY2LQqVF6f1g88k8ajaH0MGLADPP4F4YjIvD/pz/ww3qbn1BTjrqSzUyUnAWy5obD6b+qZlxN/w0nHyXPqIJprg= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712773543; c=relaxed/simple; bh=HPowQh26MLNrgSXo9yN1ir8gAKHhJ8o6nYl0KqdNBS0=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=rNdDKsj3PykcvLf0Er9sBpgHpbC6ioVAkg7IP3fMFszYekmNJdfcE1B+Y1EuZAPuR1lCXKlIRWzvSLvPJfqnOJNeBGynPB07AfU2FNqHcJMFz/WBqCg0Ufefqn1fSAO9B7/0sjkC4U106ZEUt/Ey1b9XSOobKEneWtUCdNG79gY= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 43AHhdPF007034 for ; Wed, 10 Apr 2024 18:25:28 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=JQMUz6BexSZHM1uZ6yPv3MG/XHWINgO+VLiNmd45ZH8=; b=Asw++oZqZ/PRX22Jekf8bSQhtOdGZy7+X2ZPbuXwBCU88BoecwHNtWNj+pHp9hbJP07x 5BwKiOQdzq48We5HT3dbBRUnh9DxQLwVxlSmngKIo4Q7k9Wka56BDqqK+mld8eOvhSRd LMUgIkTdbh6kRgBCtTFHWuqE7InpxTvEw5OJ+76gIm7RSNq2X4T6/0aZeD0slrEeehFa L53tgPyMbHqo9IuSm6Aptf50wFMMqbsTV+TBoKmMS9HyGi47VRr+JHvwNlqLjs9rxMSp PipVM63qCVpVCr+CfxMBiU5+Cwgb51hFH6K1cxG9cRazEplBnkuxEpfSrwpveIoxFImJ 4Q== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3xaxxvg194-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 10 Apr 2024 18:25:27 +0000 Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 43AHdnT5007811 for ; Wed, 10 Apr 2024 18:25:27 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3xavu8hwpk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 10 Apr 2024 18:25:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JQr8lpHOSVjeZQdKLVFwum6HEqh0cqG6w5Cy/P1IuAtvsHkgbn04BLRP6+TrBQ3Nh12izcigTFRwyf8tI6l7XzeJksy2K3N2dONPjndY+83IcinLq5NOyvv5wEQViv7JHcXE1vzh5a+kw66lrU7eFuKlGoYhtdlYosmmk6u69+S8NPXPz+ozPDzNH95CdIvoJT/aFh3A+kX69hcZoZMf4LT9OInJ3wmWAwUEaWyf+82jbRt413JLpGu+09j/sJQiPzHmlhWYKtMwmv8bHku4TnbSGjS0QSJzn3+2RKHndDqCwCtBg5R2YRGzMqR54dF6iJt97vdaor6YiGahIfIV0w== 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=JQMUz6BexSZHM1uZ6yPv3MG/XHWINgO+VLiNmd45ZH8=; b=jXv1OJajf9yLoXFvz5QL/MeejS25bhM69CMbckQ//otUBH53NbVqO+mr5sPqmxZWzp5FbPDs0RN/RWB5K2Vez4w+JMvlu0IiDEkWKDBiWMkdIVruIER1QWCIk4NlawMnlfNTetnEPxn6Lue0uIFZIiR8xjV9ZFGeXyQw8URu3aHJMZkWfG8bdfYRkluCKj8Q4dZc6wVqWTLB8DeVkC+523Jvq8GhbNKWn6V4CKLeM5yYuXaUiXXfNM5G8asTegfOBSrFQqWj1POg4YUGiqUZ6wiH4FyhCpVZpPLkEBB14+nzE9zjB9O4goS5J/jxNJHxhNdTFWtBhsiuac5d1QhKYw== 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=JQMUz6BexSZHM1uZ6yPv3MG/XHWINgO+VLiNmd45ZH8=; b=OCnZZDc0KjJEnvEaPQoVt0HJJkY0GXEH39ejtDS3bM8HGJWyUJIEjZaVA5YqaQso0GtglVwZUCH0L+dD4IRyCghjqTkZdG64c4IV/bsOJaPFBq3YUOR9uxpQDhunAVP9RM5ZtM1HRDs0f5GGoVnnzH1eyu9hDsgflXy144A1aD4= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by PH0PR10MB5548.namprd10.prod.outlook.com (2603:10b6:510:db::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 18:25:24 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::6ae9:dd4d:17bc:4f2]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::6ae9:dd4d:17bc:4f2%7]) with mapi id 15.20.7409.053; Wed, 10 Apr 2024 18:25:24 +0000 From: Indu Bhagat To: gcc-patches@gcc.gnu.org Cc: david.faust@oracle.com, Indu Bhagat Subject: [PATCH 2/2] btf: do not skip members of data type with type id BTF_VOID_TYPEID Date: Wed, 10 Apr 2024 11:25:11 -0700 Message-ID: <20240410182511.1528093-3-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240410182511.1528093-1-indu.bhagat@oracle.com> References: <20240410182511.1528093-1-indu.bhagat@oracle.com> X-ClientProxiedBy: MW2PR16CA0064.namprd16.prod.outlook.com (2603:10b6:907:1::41) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|PH0PR10MB5548:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pCKoitFmRQXGp5UVxgoy98uxaVf1dvsS3fI81+T17fAVfl+IS1eWJShZ9EY+ZTWDxOOUxbbRpK3R3+36/4RM7dzmAWX4z+jIHkYGEi2at3WHhNI/NKuX7QUgQZPnKzKKocVukA9d8rX4x3S6Gik+1CvHfAcdzRvEYhFA2rQI/9iMlcWTV7s5zr4HcnpFi+DPy3/fEbV/hYNmLkz7XbLNCiGKciw2IlhnQy0Ep+9TROwueREgKrvKZtUC06bbFux54tW2qXjl3nosC8o1WPm31CS5wzFqTv1K9N/NWriuY4ZwkaSN/ThUsMRhEWD9r1lVbVn9hOy+tP+ykDBelz672WuUC+bIpYsrEQQRteOGgTHyGN5Kv283UnR59w0qGLrkL2guVJSCty7r6MieIRtr+PHJUK+miYX4HVWRqVX6kkbtfwr1+AKSmxzP0ze+E1BMLH4TY+NDItFCWBcq8fqmxAM7/Nhbbdr+dmz6Bvixc+DZ8LjW4y2CnhF+ivNLYd982Qdcbh129/s6jP/SHoh3+MsSROBZR+I1fSU1mjWxUOf9sIsx4O8nqlJdh+aMi0NmVSqZyN+pcIpyrVLb+06EqxQS5mVPOezMhrNnHBZXXqemFwuYeelSd6/WHpzzMxkbizUd9Zwx/ZhFtGhDMUh4gqpn4wbXf1Miy16ll6UPiCc= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR1001MB2158.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(366007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wxoa1u5Swd5wyI5ywY9WV7J1mj538iexIew2VBdRW/+EN316n0LSfcbo0PCHIqXYZJwMYrFBY1C1ft60bkX3+AgQSMdXLIbcXzOQOgxD8eieDhvq7cQBvj5CAo784IxjnZkqMVFgznzv0s6irSUYXTmBC4T0yWNKDFY1lIrU8PinAHP8WVp1TfKz81lB2IYsijiIQtFec1ReJBtH9JV6dB3Y4Z8o5i2Riy8xMSTDgO/x6dRxDgo8j79X8AYf37EvKq/3Iq2i5kO2r1uvecLUT7PEQrxQtE3LGUZQs3ql1C+oFGo3T/D91aMCAUF/0l8FbFovG3vXFhixBn99SBAcKKSkhAokA/yrP013Lnk2z4exlv9u4my37azjfoBVE4qF6qbXqPxfpQsafmPaey32WNnDXz7h90Qb+bVDxS0k0YE+pI1Q3qfLvboJjxrU3jgtnUwskk3+sGRaxvSUlvbxivKOv6vzsNi9vg1qXJVRehmmnvvdqH9o/vD4rM2Un3HVOJPXvXnZ9zG/PZFbhGMpgomn0aS0mFrC3qqj5PAQs0DDGF1RLWf8w7PINNdx/cDv+PyrZjQDBB3AYIx12hDpMDehkkD+azjVYZuZcI3z9MpB707Db6MR3Y1wLhF08nlDOY0VlRcghNQQnxYY8/rQFalWA4Ot20sSn1+54G1kbKfzGhay+a4PjdFG1L8wV4R+wVkzh1OjhMHv4c5EPvEYKNd7NN9nQ/5CVFP6bGPD50dGO3mcuvSvn6j/o9BlzHwVH0TsqcqvX3c/r5MDfq7TrIXip+uIG0kShnUFFspGOQkLTsTuR0rUaW/lE1MADuYl4W5NWjailtIAClXpwojfVFkbMO2ZluNsxkeIfkQ3+FhxmOVUYDZ0gaSx8EEmjsOcS9kpNwWSD+2A/DoiVsLhvSUU3uF0UAekbJ9azCCQtjsWVJHGR9E4RiKxWPPUCy3sgsc51UH0znv2W5/mNTpUL55EaMYMWjx2MOyfgNuXwZCihRACzACCVRx+MQ5h+xmFV1wXObAtVGx3yOUugF5r5fhocTFGxbdXR6QiV6ZSsn55Iy+Cgn41359me7TemSC6Q4x+cxkrX3S9HYsXv6rmfQrdkpv0O8rJa1oPV+tVSvZX6lAHf0ZWKHU0GcdYiUAiLjIo3HEz8qT3T4nv9HfcG6EHd5nfNTySHEAkuBIiPwDyv/UMLQnyBsWNmurkPda6qNBUSxHQN0nk5fozqZ+SOh5kG4Zv1VisOHSkPAn1G2a1TH1dBiQDo4TITmPyR2QFajKYGW4wBhhLctMd/++7OZTRx/djJesjg8tiXWVKCGb9/fuOKC82CXAQqntyGkOVDxceiqBzW4KLrmeXBAisb2gBarUs+3EHm9k/WeplEyBEIKe60Mz3P+LDi1lbhYOyT2jJ4oNfDyiioCSYUtDuyj7EUt3njKvm0VHwU/dnGkXY87QbCRhQTSlhmTcUNK3U8UFVI5vT+XqghZHYYI+pGcuKnawM4TE6dLXjghQcOs3A4yUZGfRp1AvLeSDFC48gmyl062LwPRocKsoSXNMIYtWeKYRLHIQvt0lJvJCPsM5KRehz0jyUUXNyUMCTOaXsgVCjJVAlRUBjx+YJ/mvMv9fNTruUx4HPJWpmEeBnpCQ= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 21ef+IqN108t5dJSSxckaw10LJin1qrX0qx0fkzzvmsvKo9EQHZv0ehPQZ0QQV0ZGf3oIJ6yfDBbk33nRnXNUqJ/sO7WXoMnMAhLUU70ZLLgZk3wnrXTP2S/JC24JvC0/PzrO27F/88lsfSDXW6xfVUgmMdOI9LE3Po6Sm0lwrhXKW6NikcGbGKkKUMVnHc1XDq5Ai1kZAWNuBijJt1BUAwY9BucC/jAxpRqALw49kxeBT4eLC9qmNGLRIHvbTgHIj3PwFjLRwYv4EQm7hNsL9J7EBb2hcgJcpvp6K6S+jQ5sSw9eBXFesvvA+FaggjK7tLBgr0BijByjuxQ5IAyIQvH5eVVqD+VD8dXdikgFCDixb6GE5zaPuW1qnunN9X3/V5st8Bqy96CwOJe0tG0Kn0zSARDTE/OE+JOwJKDzCGBrmQgWiotM4USClaHKfxWL0jq3E9x9+eDRLvcS8DUTWLpPAN0YRu3PA9m+mpIuo9aNDZGE70pCgLynFvm9oNsoCsiu2ZRr9CH2TlAdE7tSHghKvBFjr0KCQG5EPT4JbrlFFt6hvA2d1Nvott1AqEO1ZbLzXKHVO7IuZ29xJuvSgMcwUwppkmtcdoraJtRNRQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4e5fe37-76e9-4064-c61a-08dc598b96f4 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 18:25:24.8880 (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: 3ppVerGhe2/tVKMLm4ZVohZIA2WAv099VqVtxvb0hnl3X6ifqXt9SmL5T7+IDw3er/6J3qtEK4CrJK33XfN//g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5548 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-10_04,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 mlxscore=0 adultscore=0 phishscore=0 bulkscore=0 spamscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2404010000 definitions=main-2404100134 X-Proofpoint-ORIG-GUID: XGWvnwxRTa0xROBmKkJHkuO-rLs9Dh1o X-Proofpoint-GUID: XGWvnwxRTa0xROBmKkJHkuO-rLs9Dh1o X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Testing the previous fix in gen_ctf_sou_type () reveals an issue in BTF generation, however: BTF emission was currently decrementing the vlen (indicating the number of members) to skip members of type CTF_K_UNKNOWN altogether, but still emitting the BTF for the corresponding member (in output_asm_btf_sou_fields ()). One can see malformed BTF by executing the newly added CTF testcase (gcc.dg/debug/ctf/ctf-bitfields-5.c) with -gbtf instead or even existing btf-struct-2.c without this patch. To fix the issue, it makes sense to rather _not_ skip members of data type of type id BTF_VOID_TYPEID. gcc/ChangeLog: * btfout.cc (btf_asm_type): Do not skip emitting members of unknown type. gcc/testsuite/ChangeLog: * btf-bitfields-4.c: Update the vlen check. * btf-struct-2.c: Check that member named 'f' with void data type is emitted. --- gcc/btfout.cc | 5 ----- gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c | 6 +++--- gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c | 9 +++++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/gcc/btfout.cc b/gcc/btfout.cc index 4a8ec4d1ff0..ab491f0297f 100644 --- a/gcc/btfout.cc +++ b/gcc/btfout.cc @@ -820,11 +820,6 @@ btf_asm_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd) /* Set kflag if this member is a representable bitfield. */ if (btf_dmd_representable_bitfield_p (ctfc, dmd)) btf_kflag = 1; - - /* Struct members that refer to unsupported types or bitfield formats - shall be skipped. These are marked during preprocessing. */ - else if (!btf_emit_id_p (dmd->dmd_type)) - btf_vlen -= 1; } } diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c index c00c8b3d87f..d4a6ef6a1eb 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-bitfields-4.c @@ -6,14 +6,14 @@ In this test, we construct a structure such that the bitfield will have an offset so large as to be unrepresentable in BTF. We expect that the resulting BTF will describe the rest of the structure, ignoring the - non-representable bitfield. */ + non-representable bitfield by simply using void data type for the same. */ /* { dg-do compile } */ /* { dg-options "-O0 -gbtf -dA" } */ /* { dg-require-effective-target size32plus } */ -/* Struct with 3 members and no bitfield (kind_flag not set). */ -/* { dg-final { scan-assembler-times "\[\t \]0x4000003\[\t \]+\[^\n\]*btt_info" 1 } } */ +/* Struct with 4 members and no bitfield (kind_flag not set). */ +/* { dg-final { scan-assembler-times "\[\t \]0x4000004\[\t \]+\[^\n\]*btt_info" 1 } } */ struct bigly { diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c b/gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c index e9ff06883db..fa7231be75c 100644 --- a/gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-struct-2.c @@ -2,14 +2,15 @@ unsupported type. BTF does not support vector types (among other things). When - generating BTF for a struct (or union) type, members which refer to - unsupported types should be skipped. */ + generating BTF for a struct (or union) type. Members which refer to + unsupported types should not be skipped, however. */ /* { dg-do compile } */ /* { dg-options "-O0 -gbtf -dA" } */ -/* Expect a struct with only 2 members - 'f' should not be present. */ -/* { dg-final { scan-assembler-times "\[\t \]0x4000002\[\t \]+\[^\n\]*btt_info" 1 } } */ +/* Expect a struct with 3 members - 'f' is present but is of data type void. */ +/* { dg-final { scan-assembler-times "\[\t \]0x4000003\[\t \]+\[^\n\]*btt_info" 1 } } */ +/* { dg-final { scan-assembler-times " MEMBER 'f' idx=1\[\\r\\n\]+\[^\\r\\n\]*0\[\t \]+\[^\n\]*btm_type: void" 1 } } */ struct with_float {