From patchwork Fri Jun 2 16:35:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Faust X-Patchwork-Id: 1789790 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=mQ1s5/Ec; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QXpXN0CxMz20Py for ; Sat, 3 Jun 2023 02:35:48 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 197B83858439 for ; Fri, 2 Jun 2023 16:35:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 197B83858439 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685723745; bh=y3vopH+OqvVBre/3jTARsF/BDhqu2Xtb8MnYG9WLjIA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=mQ1s5/EciXazXcL7EvefS5SFUvfBfu9j6euUo43lF3IvSMMJiq3AkLvDstGG1vfYd 4YiNDFUMqQkNx4ToWDEXFDVjFVn+6Kcbt5n1msLA4PUQWImK9fxTlyUaX6RPAeThQn G9zqINNUGRlj09fkZiKAK3BpXaXEZRVFkGvQZHBY= 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 9F78D385771B for ; Fri, 2 Jun 2023 16:35:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9F78D385771B 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 352D6NdI003354 for ; Fri, 2 Jun 2023 16:35:20 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 3qvhmjud2r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 02 Jun 2023 16:35:20 +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 352G5obD040737 for ; Fri, 2 Jun 2023 16:35:19 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2170.outbound.protection.outlook.com [104.47.57.170]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3qu8a9h92v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 02 Jun 2023 16:35:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JS3KFjazifSSLir5SmDNnwZeaoGdvGws4p4s0xKsl2Ju7VY6/s33Za2uevq5rlzUoXvfH7BwW+kpdbnDAgC0VbB8YqgU8yBLG+xCXVzpZKwOEg/xZn6HumVBm+46D38j+ow/l7Un3mxiFqWkyVt4hsJ1LDJA8HUL++zWkx/o4DMpZFDCIb/qybdshbsnWjy8eKZ8k/nm9v3APwQBlBKLpeTUxf2GNXQa0qU8iTSlnWsosZzK+67k42wZiuKt3/4h6iqASVovIRPVPEsR/5e0drNEb1/u8oWtyHGlPUqGuNWZLN61xZ7otj2pDjSE7ek6NHjGHRgVwwbip53pzlyqnA== 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=y3vopH+OqvVBre/3jTARsF/BDhqu2Xtb8MnYG9WLjIA=; b=c/hvDVc7sqfYcReXuGVBhJEC0GkGBrpOehGXDdGigi1kYIisahU+t5a8yudcCMVlKQKmeZ4RdztsWTmPlQ0qakGzbbrFu3b26QTIjv7iJMJiSVE3Etnak7EY2be0aJZI6iawT55FVl7AJL41C+EhZaS3RbEb0YoN+8pZ8buxb0YBOz0iZXhOgLj9otxwf/ouWwrRPH0R/uZhOf5Fyfvbldars+sXtY3McqlE1MbAXFI7/jRLEBCODAdaqpzDSmJX+zOq4jcaVP6rCfYRQdLPJl0J1UckQzj6gWhoA3iKpotjThKyge4czFpCJKFaRkOhsjHA2JaS7YWgwiziHMgmwQ== 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 MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) by IA0PR10MB6913.namprd10.prod.outlook.com (2603:10b6:208:433::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.22; Fri, 2 Jun 2023 16:35:17 +0000 Received: from MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::1797:59c3:a40e:f8ab]) by MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::1797:59c3:a40e:f8ab%4]) with mapi id 15.20.6455.024; Fri, 2 Jun 2023 16:35:17 +0000 To: gcc-patches@gcc.gnu.org Subject: [PATCH][committed] btf: fix bootstrap -Wformat errors [PR110073] Date: Fri, 2 Jun 2023 09:35:13 -0700 Message-Id: <20230602163513.6196-1-david.faust@oracle.com> X-Mailer: git-send-email 2.39.1 X-ClientProxiedBy: DS7PR06CA0052.namprd06.prod.outlook.com (2603:10b6:8:54::30) To MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB3213:EE_|IA0PR10MB6913:EE_ X-MS-Office365-Filtering-Correlation-Id: 567cfcd8-7b99-48d9-1208-08db63875988 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lO1/QWTRXcOg528yj1DNIQuiY0xEnFjdtHaUhYok6R28CBHdagOKt+5BJt4E2YtpVgtQoXEFzeKsdRlaKt20bL51avXyzaWxrD8zHHsD0/6GOunfcRmS9H+5qyzAFALy2devjXdMjlk4dtnyvBEpW5MhT+m1WapKlDXWcNDkxHzvkQCu+TCcSKREGjOBH2u65XckEtTfKIM8L26L4WzhNwiTNjyjLQisrkqMi+VeyC+JW2ba5fByCS8An3+cPR8EzYrkfd6kDvJ2JPLqq4Fznw19W6dc+QyUNsFBBUQ47Dku6zZtldcK/n1espGTwG/nQmgaOqf6TnDbNUmCqKCKn6kFSj2RroWb9vYX9ONwMRsFJqA8Wac8DoYWHew1Kjn2RR4W3gWqLo+SBDtQwbO9JbvCjmpZY0wLB6QsIg6xa0t6oyV4yDxbpI8SlNY7G47dff3Ibb0UxYTE6RholW/iLIMOWjVWX97MGjC99SglW4E4V5kgbrUdN/BPFizqXsK/4xOaTDXlufbDpsMDbfPUvD3jthX6SanTq5LP94mtBY6YlKV8A8YIENH2PI1IyA+z X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR10MB3213.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(396003)(366004)(136003)(39860400002)(346002)(376002)(451199021)(6486002)(1076003)(26005)(6506007)(2906002)(186003)(316002)(6512007)(44832011)(5660300002)(36756003)(41300700001)(8676002)(478600001)(8936002)(6666004)(38100700002)(6916009)(86362001)(2616005)(66946007)(66476007)(83380400001)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RNPCEUt/oXamMZNBJyTilErgLUe7uUCBXorAQmnvK2zecPvt9ikvpWK6+4RNJ51o64RfDVp42BD9Fr7nx0X/EV/PQA9FUudNgUXajZxqI6zeUnKniXhROsTa6zdO2mguM+AzuGGGpP6lMwOuO1T29k+Nr5MSPLb0x2596i2tuZ2oZY0r/lNIeqsgdODgXFER4YMTr6175haEn0uRx0XZw1PjbBDHB0L0/XqclKuBI44gFgt7dLB8NbQE/lMCrvDLT/1xkhZ+2Nl8PH2BJRC1iJzIAUfp82Vy9xJXyRZa2IkUV5j8CezK+Tt463OCG+V1QvWbJc9t+jkjG/u/f56ozAQJSiDLJAJZAYgCEp5pDgrcrcLQLhKVn/ew3yQ91nQLPCy4CLVUnoWTSq2yFqjSF9ntys5UFQSdoDOiX8nmvdCiPvewPAVvG/eR3MQCzuy96PnN0wtqZTiCVf99BJNr8dkMuEr/32dJTwFNM+6vGWx54FNWFl8VjcnlqFigm67d2cLHO4THonyu67iWFlWnxFNMfaZHJSjU6L7SnL4NlQ/tS70l0sXgS3jQ/i2N1srgefg1Oxf7Eueq9OVov2BrHtHd/Aubw6MV0VvjAl3T34BSY7nypRnaAzMAE/upTXSKkVMr3nSJ/q6Bv+O9HK4oX+Qq/NUzj6sh9gVgEgSv6UIsRwK1iXtx6ytoBWccA9EwjuvZLWMPjej2nMm02fG5dBYDF4LXG7vPVHNFT2ayBKGlMtRNgeUYKLc0ZMJoVcNxyQ3Ca03YqC/NZajUlh/GzO0nTzpjLofcvq86RwUXMp152SEcY0rKQQPxL9H5m/1/YkyzestNm6OG7U62n/cis4u4fbHomL9YO0qUufyejQzWH8acyETmMtmQUi2WFo96I97hQOrdueDB+H3pEGwEhnCk4eK3sSxByF8G/X4KLQKbVyBpXx6PmSaE9iyfseRWTgXc0CAkR4iQSRdcFWhhe8XXPxnv4bIBZku1RSRp66NEYbgB7frSUN/lHnOaLSfT2+4AeYAR65cVEqkF06EzFTYQpHD0fH73m4ZcLWO4pUbDMA0LjDJQ02VLYIEI3xmloDQnNuvUFjv1uVeRDTSa5B95OX99qGilDuMsp0CDAcmEmpRRCPNhfVqPAhwoXjY9AWWb+XnzRKxa64maB1xDZgrRqh3bGRG2uDrc06xyw5UYTJSDjLvzddsDFHZDUspOnMhA9g82ms1WoM7JdCjrOPpRRGC2fRlE/MwU6xv5UVFWTjj2i4DLdvDZJ4fnFffvwvGaNb/sTN3ZYarXsoPtQYPIeswrjQ9/TfRuSbqKs6TDQWryRnDwvSkj/a9GQyJN1gAXyUvUb1rGilCx1FfqpeB1W+fRbwjQj3LTBFbnr2tnolwtg+UXJ1LqW60g469QhA9Xew2F145EBwzUTOoVptJi5P1tF15811r5J7jW3cIQTYYDnOki/zjrFPFHvKV/GM52LthjrpX4LfaV61AWVjmgvDRISpEC/9QVKTFm+U4a0xbvxiPomZDN+gOaFsgnpb0+FZdf1LCL0LAU+8TUzCUOHUFAyDZblKgdQJvGTQug+wgEmNEKdC/YF9g5PNTu X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: b8gCs/fmbS6o8T8M0bAZv0cTIZWAv88vwV4YMnmje50OGEUv5wNK6TJDfnMTkl5xbjC9VfZfH0GPqN3dOrtMsfJ6xWfa2sVXT+1zBoqtJ1Z5eU7Vm7M61unzeAzk0Uck39POuynzmyu+MHBH4PO1XVVG+1Q5MuwKP9myL52BSfBgUI4IZVmHNrugT3peEuDapxyZhTRtNSoKAMcVjqOp2dIUy8GIYQvHzFKQ8TF4hovWl3U7T+ONuZ8c9IxagFjdPIYqsbmnXQfuMxLxp+j8gSVVBsHe//LzKl1e9pIOW4l6LMjK+esuAC/MImBIIbkfNG0nz1c+RutZ8KwrRRHtM4KhBBFYRoFxfOSvV+ZGwkwtWHQFgWuc4QaVMC/VAERHqTx71vF/bhPoiexw4TgiM/sELzyR8ZynK+eUSR6C+aYUfC/7vQoxTgv8xqBqgL9Ou/YhmQksifa4xuVmS/5PvKzqGzYlLj2HMpxFyleYNj2unwGaPahjPCJ4OxGXMRDfik/J1NYEIrCOMmjk3crnQJRKGEhQZbVVSN7Qvt5UF2NMN6WerhbLm5jMDhOCHrYclSemvDKdseT6hPghx9k2QibmXRWGnBdIKJmWrMAggVCWKD7pV8+X3ZXSraCnuZ97c87o+q/mH8jlG1WASPFkM9dQhr5rZ0RlblDbG4QpuqfLXPlXzaH/R56P62V+5oDVvwthJZNAQ2+HicsV7Gn5/5ACF9xqO+sZirt1SgvOs3yf/xFWfirTSBGcoZCEWqQ/ X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 567cfcd8-7b99-48d9-1208-08db63875988 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3213.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 16:35:17.8165 (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: pHtwxlCrJAkNfjPVj42VdClZxYoTz6e2qhiK+Y0qrdKSZCZ/uv9xdhbF85SZT/8o6zDspjGXBZJqD2IWta+9VA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR10MB6913 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-02_12,2023-06-02_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 mlxscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2306020125 X-Proofpoint-ORIG-GUID: 4lDCU18B0UShagwWN_yGVymji-A0zYcW X-Proofpoint-GUID: 4lDCU18B0UShagwWN_yGVymji-A0zYcW X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: David Faust via Gcc-patches From: David Faust Reply-To: David Faust Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Commit 7aae58b04b9 "btf: improve -dA comments for testsuite" broke bootstrap on a number of architectures because it introduced some new -Wformat errors. Fix those errors by properly using PRIu64 and a small refactor to the offending code. Based on the suggested patch from Rainer Orth. Committed as obvious. PR debug/110073 gcc/ChangeLog: * btfout.cc (btf_absolute_func_id): New function. (btf_asm_func_type): Call it here. Change index parameter from size_t to ctf_id_t. Use PRIu64 formatter. --- gcc/btfout.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/btfout.cc b/gcc/btfout.cc index 1ea68b9e8ba..e07fed302c2 100644 --- a/gcc/btfout.cc +++ b/gcc/btfout.cc @@ -192,6 +192,14 @@ btf_relative_var_id (ctf_id_t abs) return abs - (num_types_added + 1); } +/* Return the final BTF ID of the func record at relative index REL. */ + +static ctf_id_t +btf_absolute_func_id (ctf_id_t rel) +{ + return rel + (num_types_added + 1) + num_vars_added; +} + /* Return the relative index of the func record with final BTF ID ABS. */ static ctf_id_t @@ -937,13 +945,12 @@ btf_asm_func_arg (ctf_container_ref ctfc, ctf_func_arg_t * farg, /* Asm'out a BTF_KIND_FUNC type. */ static void -btf_asm_func_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd, size_t i) +btf_asm_func_type (ctf_container_ref ctfc, ctf_dtdef_ref dtd, ctf_id_t id) { ctf_id_t ref_id = dtd->dtd_data.ctti_type; dw2_asm_output_data (4, dtd->dtd_data.ctti_name, - "TYPE %lu BTF_KIND_FUNC '%s'", - num_types_added + num_vars_added + 1 + i, - dtd->dtd_name); + "TYPE %" PRIu64 " BTF_KIND_FUNC '%s'", + btf_absolute_func_id (id), dtd->dtd_name); dw2_asm_output_data (4, BTF_TYPE_INFO (BTF_KIND_FUNC, 0, dtd->linkage), "btt_info: kind=%u, kflag=%u, linkage=%u", BTF_KIND_FUNC, 0, dtd->linkage);