From patchwork Thu Nov 30 22:18:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Indu Bhagat X-Patchwork-Id: 81063 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 9592338618ED for ; Thu, 30 Nov 2023 22:28:40 +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 059C4385C33A for ; Thu, 30 Nov 2023 22:28:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 059C4385C33A Authentication-Results: sourceware.org; dmarc=pass (p=none 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 059C4385C33A 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=1701383304; cv=pass; b=XjsEN/j0lF8mvBWbGb6yfzWsQ7ZXcyWKbkCX0VBsZLf1oYT8VzcDPVf3ARBf9SSNoCkUe1c+oEz99TQPB4N+qUbJ/nS3Fr9xqPbDgpJhVLZOb2WdCK1NiCXente0WWQADJ2hVD7oZSxePtDHYZwfbUuJKbfcNzV0b/chH4Ysv5o= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1701383304; c=relaxed/simple; bh=tnmi8L7YFw5BAStyAJayhURl52hro1ATLimNOifdfMA=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=Ogw5sEcPu7KFsjZSo5vu43wAbpZeLlyzzkNnVRnP2IxLIWhyD8n39/Um/77QPoWV+JuLxSfV7v2bKKuPFF8NqzqybjoXjwhEmE3OtWN30CF8kQr0hAk5vSTqMH2v9Xoo7yCI2YcwiY01HKAg3c+xx7nz7n3JxEQtqXnI6Rf14k0= 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 3AUMK6G8032171 for ; Thu, 30 Nov 2023 22:28:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2023-11-20; bh=1Rx7KV7Mim8p9o1XbMtlk3iS7Qz9apZbz6/27/qs55Q=; b=XiEH43CL8ltCTtoMei18N+HbIZagTIlef8OR7xdif8LLVE3E2lF0qy++urZzeji9j8/F c7j7VYbBlkgXWt+xfUFbZ5TGJHxfvsXhYQVONPyESAO+qK/3R3Y5EdOkohdgTNeEHkDC cCwiy1q7yKBZOEVxeunOrrTf3r+z4serWP75ykCMuQNxmDQP0Ci2Sp7jOG1ieeLIVhP2 59TLdPcyVYSdojH92zOZYXEbQj3xskE/NnMw7KI+hsUKRnnbRwUGJ7bLkEzH71eGaOKZ AyLFrdLXFEiL3ZguYw+DSjZO7I1NpSvLUoJu0DVNvVuTGghhsBepKadikxZGnCNkcwFM zA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3uq2tv81bu-39 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 30 Nov 2023 22:28:21 +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 3AUMFxCZ027198 for ; Thu, 30 Nov 2023 22:18:42 GMT Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3uk7cauh7e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 30 Nov 2023 22:18:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GgSorjj1gnZvbsvLo88WNo5vqHUYkxds+7L7NcxqWHeLJShFX1Peaxp9b3PROVQS/bSCyTNSor8FMBGoR4/dH0xLvcyLTxveAruVK7OAng1GsRbFJllqjNhfE2UIjML1J7rX8iyIqgLuZ7L0jCizX57f141jXGNCVhaaOKnxAz83lKDF3p/9sJmOdqkYNxKx9E7mFAluqHKRT5/do44/c987s9zDIwp/d9YLal6zGoRCX6m6XHFP4DTQFnuzyYwHdSGNKE64Y5iwmnBEJXcALJC81Vjtmxzmu16NYeLMEOOvUdEJdTxHdJOndOvMi9kXyXAEFwXeVDOM2f3BI2ZIYw== 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=1Rx7KV7Mim8p9o1XbMtlk3iS7Qz9apZbz6/27/qs55Q=; b=Xho2dym48sVGeUmCtccwCq0n4/b1tHCFbhkEbZoPlLo6bMZkx8r5yRV3hu9TW7WQviwYc5CTKc60aU89j2LZX5tTWjIc56i8moOqMTT41tCw2nCc1CvJrTY7y/Q0HE6rRW9pnMNyQZkBVOmxnDy0k1uy3FiPDLk75v42Ah21QiTFzntm1kmA3mj/C2A/kV4snW5EY2a3i1zACxqNXA8248meIkqonnRBgnJmIwt92CvNPKZklerRVaDR/gFze3NMrOfNJLtScjrB3gbz3b9ZCjnm3lIzFaZAkDeRxc3ml4VGCdZY41LVk4E8gG/+gkpi64RrgAzvcRUk+FSd08RYvg== 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=1Rx7KV7Mim8p9o1XbMtlk3iS7Qz9apZbz6/27/qs55Q=; b=Ez+pYXhBFgQqAYSja4eLzSLgFu10RhKg5WOKix7DOxeCwSfK+j+Bmoo1uUlHbUPCjBo1GQPosk8QzQA3Psv/ZqFCDujTKMHHH+u6CjouJqelXzAtwd0F9PVKafA8g6rxtKzKKqtxJrmujk6AAcvZXNn6NUHY1PXvxk8n79NyHB0= Received: from MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by IA1PR10MB6242.namprd10.prod.outlook.com (2603:10b6:208:3a2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7046.24; Thu, 30 Nov 2023 22:18:39 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::88e2:4a2e:3111:e04]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::88e2:4a2e:3111:e04%7]) with mapi id 15.20.7025.022; Thu, 30 Nov 2023 22:18:39 +0000 From: Indu Bhagat To: gcc-patches@gcc.gnu.org Cc: david.faust@oracle.com, jose.marchesi@oracle.com, Indu Bhagat Subject: [PATCH] btf: fix PR debug/112656 Date: Thu, 30 Nov 2023 14:18:18 -0800 Message-ID: <20231130221818.3044556-1-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.41.0 X-ClientProxiedBy: MW2PR2101CA0033.namprd21.prod.outlook.com (2603:10b6:302:1::46) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2158:EE_|IA1PR10MB6242:EE_ X-MS-Office365-Filtering-Correlation-Id: dd1f5dbe-2068-4ffb-caa2-08dbf1f24de4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g+T9dJDbhQDRUH6nEuH1UqDLL63hr6UO6cefDQtZhLV41KQKHtXfoNS40njmc62bQTw6pLVNfF7xDyUA/Q44a7X2MdQvA8YvRI6UON48Mdr0Eyqc2wVvTcuNKgsaBI/Hb4IX3qV49OOLJrbl0eSS0KgyipQJ9G+Dgr7CmiwYkzXmIZdt0CKsSFqu2amlma7O1NvFrRFm4To/gXw/P6Z8IpWhlYq/thHmWcuu2KQaDRezYsRJwBjPBgFfaO3PnZQRNmH8/7I21bDDea+W47TTo05Yvi6GLu0Xu3sfTVw5mGn9Q9S8oINyj1+nS9KN3ShgezFrWiqLmJ3hixmvAHu8a2GMk6uzNSBP0rfqE1UJHoErnR9b2LbmMC46EePIvJG+rud3IOGZ1CQQ2I3N40P76KE8WIV5GFJ3wWdV+JiOHSbMLLdfsMiBstEzDHPEGeVE5bBswyxwjfhyYwNvG7VAvH0ncXcQnLDWMq8ClYbOFqiWWHnCbDsI5rAHvOVaebRBH1zPTDDR5j0iJ3xG4WHr8X+f6t7riZOlfTzHaiM3Vrg= 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)(376002)(366004)(346002)(136003)(396003)(39860400002)(230922051799003)(1800799012)(451199024)(186009)(64100799003)(478600001)(66476007)(66556008)(6916009)(8936002)(86362001)(8676002)(4326008)(44832011)(6486002)(316002)(41300700001)(66946007)(36756003)(1076003)(2906002)(5660300002)(38100700002)(2616005)(6506007)(6512007)(107886003)(6666004)(84970400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JP7llbNk/AphnBsOVhu2BrlDNxa0eM0IJepQoyw+arP+hnljjvOnVjsq+XMOC7u4mJ/4v76tYfQBCG5E4YE8563h7gUdh6p7g1ah5ysKJH5DMPX43f/wh3xNWsjef3Fq3NKoUwBsWO2NAJsxljeWysU0mXmWRRlMrAgGEpnvNsqWisWvhHpig7D4OaXQzNLZ0SGIZgKRg75XmuyQOOyojBWlmyjqpi4yJUOVXrB8qcdimZqJveuOl6HUITtP+dMCmpqthO9272783xlbRIIlEAPzBUsKuUVwoAM0UdAq7Ige3SSq/Iydh14F6oK/3lXRc1zjltzq3je3uP+uvCWrSHjdyqx3CcRlOhoNY/0fnoAFQf3wLM1Tq8KUN+CSVDm7lC+E/u3BEs5r6i0RLRVL2UJSW5T9CSonmdo5kNViBwhO7EKXcxd6NoemAkqNymkGMrmqJZ5wwQFVWjBij0VdzbGhYmiLI7hxBNshUCapFaXZtwcyqZbWaSzdESjqIPwevo6hVrOkZ8rvKOy181dD/N4TFBS5X3zpMvNYyUwwNFjspTrbhlsyvbN4oeDkdxjhxX8586jMjsjenEzjOqPqEf84kp1lt63dFyWlbSyPNOTW7AXArIkYr0KAges/w/PNG/Wp1FIEduTo+L2e4jFvVdWx3/CNaSdFqJ+TK7ZTa00J0CjJAZp8S/zpa2x77lL0EQ2J1/zjUZJUmBPHZnzvgcbhwVKBkpJ0KBn3Xlzou4CL/hSFHeazH7WceeBFzVfhNrzfL+0H+a3JV5OIkhNhMwAYmf1R4LFFpcJ1kHCOifsixyhpDs+Y59DC+lrgSt3hsOtaKyVv7x/fE/WKwUt6M/NwXx3olbXA9QgM6CDS3wQuTeMLQIe9aG/27kHOVc97V4pxs4XpVbcPi7g7O45Mg7bIMOY4Czzs+b3dx3+euQnAieykDeqsd7aIdGgLhW31FfbZRaz2J7pPTlOQoXtVZ0eIfWKDyrBe5VtSXOJ7sGGjrNPS1X7VMP1Z33Lpkd6tTZl2BCKFJjeoichVpuDcvFElH87TkQoJ5aYfI4DgP0WJAY0cdUNPbv/k2QD63y4ABj3PHcMKlacnZST/TJXhMQT2VOyyyFFR4xwaiFkltFaDqJtWON/cGCX83NQ4DDvtPllDgMNY48oqY3ea4GqSbNja14uhTjlMQEo507xWamR2WpWsIyE/sc0iTILSLNGFjPMHTahNqK+cbG6X4MKx/1p8c+ziZO+nP1Ya8oykc3AZO+sZCSCTSH4MldK+u7TYErnHFBlAhIk7/9MeAuVk5wrxRPZIo+rqZByT+fbN8JoQ9pzhltDR4qDOY710Si0di2Wl7w72T4EAZDG8VWs6oNwZFVkatbbyo/IiiRzXxb/CyS5EkFaraeXO0+wJQQa4fjDMQpkVRUNI8QmZv5y8VfxyVKVVGjT1iEbEDGHlgTqQlyvnmNUj0QyVWJZ9Mtb+io+WYnTkUZoED6Xx5lDHmzhbUhXjGZ/rn2IjwOxRdPJazOsqK3RmCgTgxJpfXH8cMUxR5aRhjtWVsLzb98+2VLKSFek2vFkbXs9dV6f+3UgQVIGcPSIdCxOFnz0YpE4UXxwYEwT1imxGTnltUQJNfmbHtF1D2C/tXClT8l+ojKY= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: NU+nCRSJyic0hoHtE00ikWKSq80fh/1Vhmy4ytW+2g/FiuqtEV3zdHYhkcIIEat7jqlNyNM9zOUI3DWFS2rXkDnlclpm1rkgWP9JkTA4RXd/zr3/eP3AVMY5IYznt1kOxvFYIbPl4W4MmFcUydXQkBUf9Gi+5NfSv+IQhv3MylvZdkmrnxqol/AQb8IWnrtJYixT2FgZrVMnSPZAkWXbp8pDbUaV3px7b+5A0WcMIVR4kSjgpvLCqmKDDOp0qYSvb/32kSL80Unv3ilK/vsikXYZY6lfWWrX6uQThvhmVej12uKO1lq/VB/hjO/YzJ7cJBYEM+MGIFMddBGc2G6kMUZWoVIT0Ifsbqt70PKM4C+RliDiIrBamgeSANV2pv7EENcaC4KdUiAV3/a76Q7ay0fl+fcjIJgQyzyqpn9FG/83Q1sZIBRqWYRjafCYoZp9XAbZEzCy97U7/qWSFvv8NZO3xBfn9/+o4kUBg18gZirZ5/RVvMFSf7zli0lszmWSQCIu/ptm3XP2VskOLGLjwikOKfpKelA4NqR3ZYt2IZsUVEDklKDBkXHa5SPExCsLlfOcIYv2/7Tz4rgTTF5GUZDs2te1UvUefmQGXfCHLgXU0xgG7WomX3Jw8nsDqtiK7oGSWunUl5Nv7iPzb5dIGeO4MeCvunoONr7GiyYh0hCif7gqePdEtZVm+joVvGB40mZd8/rS4L9Edc1BuClGU5EMwmI/4mkmvgZVmYHhAagMZwagsXwzV04ksDhjBHfQ X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd1f5dbe-2068-4ffb-caa2-08dbf1f24de4 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2023 22:18:39.6345 (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: StaKPwenyDw60YmIRmWTXQLp4IPB6/4vjCYRX4D4j9zWgkCiLs/9uFEF6WZg728Dbf3HsUvi65fosZrcGSc67A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB6242 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-30_22,2023-11-30_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 spamscore=0 mlxlogscore=999 bulkscore=0 adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311300164 X-Proofpoint-GUID: og8BLGexlWtTeKCThV7wAM2V6WVtQklX X-Proofpoint-ORIG-GUID: og8BLGexlWtTeKCThV7wAM2V6WVtQklX X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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/112656 - btf: function prototypes generated with name With this patch, all BTF_KIND_FUNC_PROTO will appear anonymous in the generated BTF section. As noted in the discussion in the bugzilla, the number of BTF_KIND_FUNC_PROTO types output varies across targets (BPF with -mco-re vs non-BPF targets). Hence the check in the test case merely checks that all BTF_KIND_FUNC_PROTO appear anonymous. gcc/ChangeLog: PR debug/112656 * btfout.cc (btf_asm_type): Fixup ctti_name for all BTF types of kind BTF_KIND_FUNC_PROTO. gcc/testsuite/ChangeLog: PR debug/112656 * gcc.dg/debug/btf/btf-function-7.c: New test. Testing notes: - bootstrapped and reg tested on x86_64 - No regressions in btf.exp on BPF target --- gcc/btfout.cc | 4 ++++ .../gcc.dg/debug/btf/btf-function-7.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/debug/btf/btf-function-7.c diff --git a/gcc/btfout.cc b/gcc/btfout.cc index 1c25404b2c0..a5e0d640e19 100644 --- a/gcc/btfout.cc +++ b/gcc/btfout.cc @@ -820,6 +820,10 @@ btf_asm_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd) btf_kind = BTF_KIND_ENUM64; } + /* PR debug/112656. BTF_KIND_FUNC_PROTO is always anonymous. */ + if (btf_kind == BTF_KIND_FUNC_PROTO) + dtd->dtd_data.ctti_name = 0; + dw2_asm_output_data (4, dtd->dtd_data.ctti_name, "TYPE %" PRIu64 " BTF_KIND_%s '%s'", get_btf_id (dtd->dtd_type), btf_kind_name (btf_kind), diff --git a/gcc/testsuite/gcc.dg/debug/btf/btf-function-7.c b/gcc/testsuite/gcc.dg/debug/btf/btf-function-7.c new file mode 100644 index 00000000000..b560dc75650 --- /dev/null +++ b/gcc/testsuite/gcc.dg/debug/btf/btf-function-7.c @@ -0,0 +1,19 @@ +/* Test BTF for inlined functions. + + See PR/112656 - btf: function prototypes generated with name + BTF_KIND_FUNC_PROTO must be anonymous. */ + +/* { dg-do compile } */ +/* { dg-options "-O2 -gbtf -dA" } */ + +/* { dg-final { scan-assembler-times "BTF_KIND_FUNC_PROTO ''\\(\[0-9a-z\]*\\)'" 0 } } */ + +static int log_event(const char *event_name, void *dev_ptr) +{ + return 666; +} + +int foo () +{ + return log_event ("foobar", ((void *)0)); +}