From patchwork Tue Feb 20 10:24:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cupertino Miranda X-Patchwork-Id: 86023 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 6F3033858403 for ; Tue, 20 Feb 2024 10:25:28 +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 E93263858D28 for ; Tue, 20 Feb 2024 10:24:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E93263858D28 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 E93263858D28 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=1708424693; cv=pass; b=lhizrPjjlhmL5KBuaS0K0t0MprMQs1/G9l3bBI1smE046UddHXAkOtNBkPB5E/aGE7jsdLYQNm60x6D7pgOxD7/FzBQTfgGf3te3bxTRCUMNHfI1w/8w6BlXkPuvkrcKW5OO8euF7jZR1u+jNLAfLP8xr4J2nRq9/N0w8I597BI= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708424693; c=relaxed/simple; bh=NMYWPot1FA4HKmfEading/nIVwgMd8iB/tTFyeT0ViE=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-Id: MIME-Version; b=dIj9BeIUoM936Uu/Uw9SQ7dwFsYspogJMzsSecfB/9UeT3JCgAwr+Q+wJqtYShz5IG/5jpW5RjNZVAerF5+dl7/zinLBgijK1FkZKb+aAyHM4PuvUHvNTM54r+fkEC2m8ACbffrWlizguunvkyS4azmIHMirhMFopYGTOl3VCNA= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 41K8xQ1r024929 for ; Tue, 20 Feb 2024 10:24:49 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=YNzkK/tD8TCHJZI43h/ikzP2eDbcQzm/nVjzU100IC4=; b=N0j8qcYpbU4vXUm0ECY00RVU3V5DXNf17YzjvoogCF/+M9Fh8PmOuCv1R9+uv0E5L1Mm cTJ9gidPaTRBkSBae7QyH2Coctxn7VF8Oe3y1XUwzm/gd5KGO1qML4DAyr7Mm763Q1f4 XiasmhBFw4VWR7W+u3i3m+3AeHmWCnzCRLsnueBucOet7Q1n52KdOFChdqYABBJhw2uH be+BiRlYWj5Z7ERSxGjhOKB4eLQ5PrjuwacuyqYidSJykwR3RUr7h1YJ4OHJfUUhIQg8 k93NnhTU/W4alp2FTZEsYyOydzmI/pbFJMn0wpcKuGfn+oLufmexaFwqoDemu8/fx1nR VQ== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wakqc6d2t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 20 Feb 2024 10:24:48 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 41KA2C9M032636 for ; Tue, 20 Feb 2024 10:24:46 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2168.outbound.protection.outlook.com [104.47.59.168]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wak8722pe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 20 Feb 2024 10:24:46 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I5Rw805XDvHtknFkWEP9lcUgmA1WRZv0f/7QfqsKHZ6LL7adG5vaPaashEoXYMwCp/D6dnHKY7NwB4PRPGya35BcT7vsOJAADxRcSQJKhBgRJZMrRnMa3qnEZef5Zehv1icztHBMATgBTLEQ3bXc/zqrkiYFcFV5Uoz+68KZPo4HWf/vgvsIv3QaZj4NpfSUkc6de/THVMourswXqYSbLHAqbOvgGQsumMGr+cmmH+9LxKs+bec2888V8Bs4UcyRvseIbAOFVJWOv4mUpD6uVYQqoG6CuM3Ma9/Gc+2j/Dfh+C+ItEuG7pU7x4F6PA+t3oTCm2OTKTMDWXjF9imQkw== 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=YNzkK/tD8TCHJZI43h/ikzP2eDbcQzm/nVjzU100IC4=; b=NXGgT/9z63sZy7I/PUmiP2Pd9Bg9dwCfqoqSAO+iDkNteKYU5DNMzHSKG9oJDBHAiOqX5HcLs+yfQ12g9xbBOBd28UzFc1XO0soI3fVQSyAubUA+dxLCAuDY0H+XQzlrHonZrWOqS9/q3vFBooZQGwzUp4Rfqs7NQzfvOmmx0sskUY11qwCIhDMZudxzgjwhLvDv933cKaL7xePvnY4MiF9wu+whVA9Ot5MMuQjopuPkDOmiY1eDtG0lrGnfpWxqwWqM6gdChFVglaWnB0UYTdarYPjTA7qoABhgV8le5Muw1eI+5lChvZEcNJRFj5f+J06+92mnM86DPfOJkeddng== 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=YNzkK/tD8TCHJZI43h/ikzP2eDbcQzm/nVjzU100IC4=; b=gUqf73JDTnY8nsziOSW8WCqUtukAKYUTg0UJefarQInhoI9eqTLP6KM28+sqYy307K5oSis9qEICOkoKb5C7hxSBn3xeniRZSb/IhOkuuGPOx4H12OE+GIMFeye9elDosTKk8UCOHeC2z8G8+O+2retfS9AZnTvZeSOPAwHSyuA= Received: from MN2PR10MB4382.namprd10.prod.outlook.com (2603:10b6:208:1d7::13) by IA0PR10MB7624.namprd10.prod.outlook.com (2603:10b6:208:491::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.39; Tue, 20 Feb 2024 10:24:44 +0000 Received: from MN2PR10MB4382.namprd10.prod.outlook.com ([fe80::8de3:eccb:9288:95d0]) by MN2PR10MB4382.namprd10.prod.outlook.com ([fe80::8de3:eccb:9288:95d0%6]) with mapi id 15.20.7292.036; Tue, 20 Feb 2024 10:24:44 +0000 From: Cupertino Miranda To: gcc-patches@gcc.gnu.org Cc: jose.marchesi@oracle.com, david.faust@oracle.com, elena.zannoni@oracle.com, indu.bhagat@oracle.com, Cupertino Miranda Subject: [PATCH 1/5] btf: fixed type id in BTF_KIND_FUNC struct data. Date: Tue, 20 Feb 2024 10:24:23 +0000 Message-Id: <20240220102427.1512739-2-cupertino.miranda@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240220102427.1512739-1-cupertino.miranda@oracle.com> References: <20240220102427.1512739-1-cupertino.miranda@oracle.com> X-ClientProxiedBy: LO4P123CA0668.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:316::14) To MN2PR10MB4382.namprd10.prod.outlook.com (2603:10b6:208:1d7::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB4382:EE_|IA0PR10MB7624:EE_ X-MS-Office365-Filtering-Correlation-Id: ac92dc75-9cbd-4e70-d0e3-08dc31fe2832 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /SAJCADdry2fiE5zFKa46+Ht0JibcO/qP8js38j4R+1J47WmvKkt5N9YOD2gGsaIHH6YVcTX4DRY7LjzcK3kQzR2TbRTcju8u6p6ntEWIxnopnSrijaaQH+MNEqERWZmaT1nQFVYTC7Y2+OaKSK9A+CgjczVHJKNQZv1yOcZOsHcB6+G6+k0QEhcxVm97QZE1pOLDfQEMn6Kez/wKawZnwfJgRA72bi1/KthGRhOdMLszJH8Ng6BFZWFiNdPKoxLbkJebef6I8p/XimymPJl5c/8vdquLbWq7s5ZYgW5gtqKV2DA5zbAmJ07YYl24LNSylz/YzpZeUJ6Hefd0ELpHha45EXPC2dYWAq7KP60iJHfRIP7ngNJiR9rU7ols5gcrpGtJDDGI1FnCVuotbWcs5sNIihZaqAeq7OQh3WCKBIK4Fw3EsBtZd4+tjg4hNNw6RCgWx8QJH1IamoBNcfaJoDu3h0yLyehzCGQlldp01dBqT4SHBf4V66o0wgxtO5JVhtCst5LYqTzA/8XOf2DVyW96GiCQgmItFr8b47H/qU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR10MB4382.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GVSlO7hgW6cSNlUj7V/aPv7Mn/1U9k+ppHh8yFVeBzkILq1E3wsMvyGF655xR5PG4dqTfMICAe9UlYAjsQBdASr7R7BkmHnU4xAY5osxeKnhW2Uhi0Si7StZRM5kwOlmyymuGQRdFvLSlGUIWYVLsUeT8Nynvnw4yjUAdjJa4LCVQdtaTpgGeGQ6SHnDFDB2Nrf63ZPTSL/1DOaVJyRRHfAUFkLP8TiSxnkex4gdACO6kyvdvJRr/wq/5YJDxn8ghukkwCNCaj4NkVYnaIi+r1AD+5G3XcoOWbXQpBxnjXzYy8Xc1kYRAf1Oi98XDHLkVz1mBCqMXKiHddHrvj5V9y4C6qDQUZW6PHrtQiiQ8dMJzZRGni+n4aHD6X4VF9GKuPHPcuyh3dsiqUeoeYBoltpmY9KD9cIzuPPvqA8DQyQpNeFoTCeuOWWb/PKMXpMxz1ZElFlbKtB6vAMmwrC40Y55kvxl/AC5zG2xZ5wd3CQwTZmMX0tf0bV7FMT7SMCYknTcS2w8QGNs0fWWDJVK9D/J13ZxSI5NfVWWLVkfd/qd6agxNFlVtw83iXBuuj2ZlEGkRO8yY8OJkIS/UpSSgQbk7OUqVIFbMhcsgn2AMUD5D74LBcB7uUlTD0eyAMH4948+ISp4QVAlcAC5dI1QtVJ/hgxHp40+T3uyrcnW8tBzcBx/eN+XjAEmm/Xpq2dPX6yvKgS5E3sUCQTXtlMM2HC53YUv8zyceHLcBzYk5y/rtvrwPvAVLwgSnz++kfx/Rs6BH1lKcna0VxRHOgkqKehOg5FXDV3+eM0rheMysJaOlv189UMAhvaWGqXI4aHgApADqKTxwc9mf2UNegkzrKUCtOxiLWl4iToH+sg8vBc/er02kdGpcS7K2yKN7UBKHLzD6OsYrLpjtsbBVHjwU3ZhvRxJP4JxCPRrVyF5yOh7eMSo8UZgAJxqUOFaPLQqfOeTfIydq5eGxvZYsT5C5GDcY+zoVSqhMI4hqLlhGZ1ZTgI7ONcUZ2NLCYQldGiU7/aMIi1FQrT2CzOKrWPnrOAr0LK/83uYuaTnzEk1wm8tWV1LbBS7zJJQyTem4rcIj7DkU9K6UObK0KTAXZ16My9TThPiB1LdEzGydi0O5c4coWiSYKMiAlcu9yfwQkORMlTmyV+oiBmKkg3vyd3/Jxiy3pwirbKGijxsKYo78gljHIApDtQHJ1+fnZvUGfuivuOQAS/veuPJ363/chFzD5GGLOMtm15e05m/Z/tibgFH3pSyvExoC+PrkAUBgMtG8gax5YsT+FN3nJu7zMo0EvEtJIhaxqqJfw59bDYNsp4m/riTzQUovDumW3SvrHbwntm+Z4x3Cab41vel2od0/v0Ai/CmByvZCzwjxEj2v+FrgC9kc/8KmBXk7UGMOdxUEv37tWGOCmtYcbnu8LH+w90KV0Qb1EA9v4g7+F6FD4vMRQc2H0yxXTJP+O0LCmlp1xDZsb4VfIlM/pPEDsxIHu3b4isGi9/Hh3Y0CfDfVrUfJ2chZkuwfuN/Atngme4WQavUVkCzLw15hbl/gmWUoCZbqk5ESj2n/JAKJdAbOR95mCX5pQeLy0nb8gVRVIoKhEed6h/HL9V4Yq9+eHTsDCYX75Q2HAc3eXLYpSP75JY= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: DbPtduU2eAghA7QQ3jDT45lpWraqBxDGiGDczq9jQB1CqxI34z6ibmkLNdCPwZusFC42qx1xyVw6x1MTG9t+dvnr56caF7d1dF4SFO2hJQlfYIbyqfXBUmvpV8st/cUqCbqDFN8hi5QwTK1/a7RmTNW5RO+bc6SSt2FPmgQ89pljXImAIry4MB196Nl+PyvNQbd1Nm9uh08Vjyvo/hpR8pbh7L/l3C9mmiwJ3KgXm8m7LCYEiVvBGhq4Wu7unb/6tYCE2FQeoAnhhCcpaxhSJDDdc7IC22PaNZl9S+/mQD8lY6sTjfsL/9MwMjuKn6B8NpEMR274odwvFNfVYwGYqVcWZpmo6mdZwbxnjFlt7AYK3t8DwSbCAnF4T9IjJxlJU2uIQCn68nhUqJqCgjGSXYikWF2XdS91tUraZh/IxiNr3vQTXf1iJRv74sptCvREYdCXFhicQ0qVzkzRHVie06e3RsWaupRS0uA0JHfJkvTBwcqYHm19cV79cFhjYeDKO08FvCmq2XNWuS2B5KjS0CrSICIGML5WfSJf8CgTu8cEUJIjatjeNYEvFtFQmCDqu4AtpUa3piyIZ3QTlK5k0cjCnG/BS6TdzIsXwE4wdUQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac92dc75-9cbd-4e70-d0e3-08dc31fe2832 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4382.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 10:24:44.7711 (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: qlMfVY8bQjxP716c4J8p271KNtB2+m41P12S4+NLCrFanbo/P0Nu8MA0UyFeVmFcRhsxmTqXfxRaFJxhx8Qf9MO5khfGMIiV6DT9ju3vTP8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB7624 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-02-20_06,2024-02-19_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 phishscore=0 malwarescore=0 bulkscore=0 adultscore=0 suspectscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2402200074 X-Proofpoint-GUID: gN_bSD2nNnggzHaroVs-w2OTbT1tFomj X-Proofpoint-ORIG-GUID: gN_bSD2nNnggzHaroVs-w2OTbT1tFomj X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, 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 This patch correct the aditition of +1 on the type id, which originally was done in the wrong location and leaded to func_sts->dtd_type for BTF_KIND_FUNCS struct data to contain the type id of the previous entry. gcc/ChangeLog: * btfout.cc (btf_collect_dataset): Corrected BTF type id. --- gcc/btfout.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/btfout.cc b/gcc/btfout.cc index dcf751f8fe0d..7e114e224449 100644 --- a/gcc/btfout.cc +++ b/gcc/btfout.cc @@ -457,7 +457,8 @@ btf_collect_datasec (ctf_container_ref ctfc) func_dtd->dtd_data.ctti_type = dtd->dtd_type; func_dtd->linkage = dtd->linkage; func_dtd->dtd_name = dtd->dtd_name; - func_dtd->dtd_type = num_types_added + num_types_created; + /* +1 for the sentinel type not in the types map. */ + func_dtd->dtd_type = num_types_added + num_types_created + 1; /* Only the BTF_KIND_FUNC type actually references the name. The BTF_KIND_FUNC_PROTO is always anonymous. */ @@ -480,8 +481,7 @@ btf_collect_datasec (ctf_container_ref ctfc) struct btf_var_secinfo info; - /* +1 for the sentinel type not in the types map. */ - info.type = func_dtd->dtd_type + 1; + info.type = func_dtd->dtd_type; /* Both zero at compile time. */ info.size = 0;