From patchwork Wed Mar 13 14:24:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cupertino Miranda X-Patchwork-Id: 1911737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256 header.s=corp-2023-11-20 header.b=S3tbCCRd; dkim=pass (1024-bit key; unprotected) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-oracle-onmicrosoft-com header.b=STPoL+kt; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tvt9G4sqHz1yWn for ; Thu, 14 Mar 2024 01:26:10 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 61B493857810 for ; Wed, 13 Mar 2024 14:26:08 +0000 (GMT) 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 3F3253858427 for ; Wed, 13 Mar 2024 14:25:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3F3253858427 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 3F3253858427 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1710339944; cv=pass; b=XMLBFZzLeE3EMwOavBkAqKarIps9W6dJZnsmvGr91yip+I38bS7ZxJB03+qAx5VOVx0iwxNd2GUwZYswKviDEJngndmQ2y5vQ3g2XYTKwF0IO1z7cuSZHALzqSFgI4DNAYpqzALWdMzOyr6+W7LofmHzoMoP6hpXHRgyTHWAP9I= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1710339944; c=relaxed/simple; bh=R0aB/MosbK0Rz1Bf42mpBtjxF4a/i3J5YawzQuSZ5VY=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-Id: MIME-Version; b=qtsmDHCGI3xQWRmF9nktQKYEuBvC5C8y5rx/6zg2J1HZQi5Jvt0UX2fIHzKqSuHXpuFpERQsIf1b3AK3UUmaXxae+y1m82H2Am5fpfRsY3Tc8NihD0PT86AlXf87oQJnJWTnE/TnC8fAx1KCZ16SdeoGzk6bCz/uGzV63Hfmid8= ARC-Authentication-Results: i=2; server2.sourceware.org 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 42D8hkcj004505 for ; Wed, 13 Mar 2024 14:25:41 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=JA6u6xIAWbLF8ecUMqtaIU9z58/AQay9HZysMWr4Kts=; b=S3tbCCRdPTZ7ARSDuq3TevUQEx4iEEUDtdwuxNCl6JZe1+WYaWA4o6bdR2085xJyRTnp lyScSvoxloHeAcE0zjjzqs+2b0d/2W38S1XwCiKAln8ZZINVzC0jD/GTs5flVKRN7jpF DKUpRAcY40tExvoBJdic9RzdjJp6aUXetQo2opOJS+v3ejbNDjgG+cLWhhrE+dP1SJL5 E+hsIPCAewUL7FMDx72o1f0w1ehN8zeAX8t8nVYY9xo+ilFVAUnxYOanuDTdJeDpi9jY Zz9HD1D1tBUJdxiCQtQPfYk8+5StRyUBaEMeMS81gYeqcwpbab8FI1XGE7MfuB6aaqZy Ng== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3wre6eh2h5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 13 Mar 2024 14:25:41 +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 42DDNmka028499 for ; Wed, 13 Mar 2024 14:25:41 GMT Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2169.outbound.protection.outlook.com [104.47.57.169]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3wre78w1sc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 13 Mar 2024 14:25:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g265D2Ac86VckAkysRW886VSZjL3unvoYyCabcagBhVmDSPfiSSM80sP+wzvLuG7l/+OQxuRNRccPw7v98dL6xtwIb2z4NtXWQOrn+Pl/FGw2yiF+FmXPHOONf34UOHwQ+z3EN6+1yVQ0AarL2mv2+aFdc/Ro71Dx27q+XA1G8CdXHHKEwLLnmzoIUObyfkqPj3fsUPLgjb676uZplwtEnmKMbWfpM+Sd22BOntQRlc4WaRJ2kc1dEEx+yGo6VVZFkbLl/e/q+ndD2BXGBgTKdNX+N4x8L7LeD+0mI37OTRVgAD5QLhbsvIP0dtfm4x/L7vZwkFX5g/v/z7FTnu7xg== 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=JA6u6xIAWbLF8ecUMqtaIU9z58/AQay9HZysMWr4Kts=; b=T0QDVx3KasCxo1ljtnQeZXyWz3rXDRl3/H+i0WfwjXxFJIfMijD4qjjbY2a4FjBrXgyTWkYsy8A3M7UnhBfC9IrQhZH/O5556z+s9kCr44o+Sru0H9nQiaijovFuIHhjtp/pRI//zUqR2+4YSOFZblyO9NObZFS51at+2ww5ViLbFn7w9c0UPNO/VGY2gxndZRWjNC9tYVT0e6KJ28BHnt/PxOSGkjvZL/jGpQQsXjZzXkLm7bnKJ7rdIFy0cYLhNHiLLfOnNirzvpNlBQKG4s6rMk59g78kc9ffkOhNOy+AfjBl80kZECEK/dVNOCFFMzk1j5R6GIv4lh/3KUYqhQ== 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=JA6u6xIAWbLF8ecUMqtaIU9z58/AQay9HZysMWr4Kts=; b=STPoL+kt5sPYKdm9JmHA4J/Ceo1XXZXuPoE/yA5VOGa+wNhcsrmo/2kAFatuhHR2o5ChQG8l5+g3wz5Y8R7LqyrDJ6z598nlYjM6kjEjF9YESlDaWgE3wKdKSHOTg0awEO5nXilgCH0yIV/2Qoqjpt285RVRHQNP1c+P/xqP0OE= Received: from MN2PR10MB4382.namprd10.prod.outlook.com (2603:10b6:208:1d7::13) by BN0PR10MB4888.namprd10.prod.outlook.com (2603:10b6:408:115::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.21; Wed, 13 Mar 2024 14:25:39 +0000 Received: from MN2PR10MB4382.namprd10.prod.outlook.com ([fe80::8aee:c094:84e2:9401]) by MN2PR10MB4382.namprd10.prod.outlook.com ([fe80::8aee:c094:84e2:9401%5]) with mapi id 15.20.7386.017; Wed, 13 Mar 2024 14:25:39 +0000 From: Cupertino Miranda To: gcc-patches@gcc.gnu.org Cc: jose.marchesi@oracle.com, david.faust@oracle.com, elena.zannoni@oracle.com, Cupertino Miranda Subject: [PATCH 2/3] bpf: Fix access string default for CO-RE type based relocations Date: Wed, 13 Mar 2024 14:24:40 +0000 Message-Id: <20240313142441.180242-2-cupertino.miranda@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240313142441.180242-1-cupertino.miranda@oracle.com> References: <20240313142441.180242-1-cupertino.miranda@oracle.com> X-ClientProxiedBy: LO2P265CA0023.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:62::35) To MN2PR10MB4382.namprd10.prod.outlook.com (2603:10b6:208:1d7::13) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB4382:EE_|BN0PR10MB4888:EE_ X-MS-Office365-Filtering-Correlation-Id: ce7737d0-b936-4e3a-2561-08dc436974b9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AYSACH4IBZPuIAzip11Ts8MwjCsLzQLp2g8E4Str8qOcbFLABXcx5ugfDOhQE/aOJxRoq++otjqLVyZp6YgHHXrVn5bQ0HVBL7NQIz+pHiKhM0CcMVu53r+iQW+SqnbFFxryOaga2pb72p3Ddy7q9z127bttoZPUAUJxPdXfQwUd7dhEFcw4raYI6hF0EMTltFO13O1X0jIXcJ9dOlq8lsRf/MI6lTsLFEYQwOA+TY/AjQOsNuRkj55kASd9CRWeChSckx6IlOZ1kYXTyEEZS4InClgLLCPxuYLiuBrsXVGynUzg03TlJxg56uSaPurlCuyC+BO13Lwpwt3JXyRrNxzIdbyTRPMVpbMhWCWm8mv+Q/RjSzHQEcMOsKIX6K29PfU4c/GKLRPR9Cksy4fmOif+vHkAYNor/pWRrvKMTL/MxbAYZZnKs38rCBViJLgo7kMxFa3qhJSMT6eAFKE0uNqn3di5zR7gImCnxSjEnMc6DSCri0MIQk63B4jVwVfQ+w1HU+gWgVwHSsRodYt3HzB49rNHom3XeSIUT04YUwjW6Sx4UlPlhES6dGZQj5KH8FnIWFopoSigtXwckFzsG+DwsLepwn1xQyJRfgHlhy8BuN+5I8Zh9y5QYobvyzLL 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)(1800799015)(376005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 500eBcnza+UW04sU3mcrId4EXjEkN2hIA2bHiXynPIJsa7Y0hCYrnwocWDEMHBrEL8eWy2KFqc/SLS6ubWhMeFNkc6G75baaQULqmHwJX6KhiIXE73FuFdGlrf4MG4N/1oi4FNU8L/9RJLqlTCynk9o+Tj4rrMw1pk55qQ4z3JgqyiEVPwJ284eYU/Yh3tfDi5Gf/t+mhVji7K/dMVh6s9fK5w7BlLAPZL4AFmjLoX7xaomTBRRWadrDNyiEAtirMA5EBg8DTrBbp23VeNtna4+DJ4pRGz2TwLKR38s4bcoZy559eD3rJnZRr7oycSEG8LW011i9SsU2QYLFpCca5yqe8ceeoVFL9Io7eIaHDY7YekDFf3fGqceMXn5gx4UywdgElwKhh+QHT4y+HpLM7/neaM10U4VPZNv3I2o7izAQwyjlZoplq0w/CWe3GcagF/CbTJtBObQ8veCDH//Mgz67cyoQAtjtcHaYxrqkeYNkScQyjJ0sSEh/6ZFFKlvfaMI84z7aE0Vi9MksweTNfVP0bv3UjiNl8H5+UUzjBmx0DWdHwIF2Gd3SUdmRGXRFkh5w6t0XfuQrjyVq3gsy8OTUh0M7uDJTN31DHa0qT4gqWUaP0UwlEjV0ENFSMNS3MnzAh09xlwQgrVnpP9UtXmXDQZTYUGTRifeDfDZbUv3yVuyq3JU1I8EKOl3HijpMRKjvlivwph91Fv0XyOBDhyZqtOa7z9tYDlbzWOe04cDKFVPCC7SaMpiZ9+nMjnTpJezilw0QEk7aExaCn3Je4L+4wzsoB10JH8Ux8cTgYa08dkucWkLCkxXbrxwlY2gJ0Oat56n20lr2h4oMGN39xQxREoqyOkMRbmhGJOhBvcPDra3xSXTrtDpTuViJU7HQsdowfM2jUlTbgZpgFM2i431q/qZTyIgOoZRyxFAQnGVaQ2w6v9qImqtZzxBzVdAtpTJan9tFB6wizQZtkcyLaNqL4swP/IVejfK8rkvuo7mK0UQ1Nqbyda7IeGcpAmcTWO0gnirR6ly1n11eBCHyIfhVwzmRqLL7XimyeyCqp1GA+7BEVDVXbfj+GokTyyyfypyEViDSTxBkLWi1MSvWalcbiPkUYsmok6smwjNhhFqltOzzirXyUhlYYOMoJdk3rbsZ3gfoPRjzLZSnj9oJ+2P9BWq27ftKGN7rz+2cqM4J/+L0CiToTBiGafzf35s7Ny9nSLIRnTX83u6fd3wjK/3uOFFu9gb70l237d/3F2XIdYvXZ06KVw3HCDSMQ1Qx67fxlN7i7HHt9zkZTfra1i3QtJG3vVty2Q5M1d5rRFSR6vO+8xyIHRgJ3Rx+Md3I2RGIr+DV8sKx4Yh2eh/M4WXk+WVqTNjD+6IG9EAJMvH+w3rtG9o6jUYyfIvodVQRRfoTEyHMFHZdT+jMsnQWLgyEyyzH1xjhItAELqS4erbqHdRjAhPtmteK8M4iH/HgyPsoOpmDUfyUIuzY0D0HClNAl5eBAbk1Bh+QXdy60B3xxd2FChkbusbv09Vl/zc60YpB+uBM4umwtmaoJUTfADOwL0oBpr0/lG40jWZRNVtzhtX8s6IZTKbiF+lMfi/9ASFUcFEN4RiSRpTZxnX1sbLhFKMMLqLVjKwWszcMnVU= X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: j614ReoJlQ87D/8zY3n9NLz5mPRzrVexuY7myYnog/qMmZhF2jq6uPynZRSOojY+I5FrcKpkNshOEmORGBJhND/I0iP5Nv+xBTbo/fXcbxgHKLEateXlYF2qSRd2K58fdFxsCksMNHpvl8hEaVK71x8LV4vRWdUvgylKkNkdEp+WKGS93djtVO58JrrDW+JAhuE+z74+Bz/cquHaEwRKJbBfhnsAbiF7dcgIN8xRgux7kNds0Z0HwYGHOG1LdcmQK0Prq7IMK1vv4taaaR2eaDTtnaw0hY9h237EDi3y9bAYMLullDCDoh4UeER1yVwy+bb6dTzY7gYmEEr53MA5PE4QrWvglG74MiRC3QRQtyjQc/84Y4zX22xVoiIwqOT4aWoc31PG1+AY7p8byQsg98wr+YEpAR2jCHza/OkqSHvUb7YPJZZcCwSte/RcBVEOx6SX2CaXoT38glInm0yRbZT8kRxQE5kyLLYPXr3FCM+DYZMYR5B56wNPXyKmODvhzAA+gYejeRSsajCvywpPeuEq2oN4yN1EeWOVA/gejVNiz8gpyD01r5lx8y8jTNdZ9+DMGSGiUDxU+aSum7FumvXSbNN1m2HD8vTu9aNjyiI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce7737d0-b936-4e3a-2561-08dc436974b9 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4382.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2024 14:25:39.0215 (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: FFLvnOROJHrJQPvAvZW6xJbk78rVr7RUOwkriEW8Lpn1UUWkXk/vBs23MjJQ2j0zVOVj1unrY1GfoiBidnYVXNIYFkCyOXjVX3OgunZfYLE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB4888 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-03-13_09,2024-03-12_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 adultscore=0 mlxscore=0 phishscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2403130108 X-Proofpoint-GUID: FEFWpTxVJhkv2A0tvfzl4pSIpXG1Fu9f X-Proofpoint-ORIG-GUID: FEFWpTxVJhkv2A0tvfzl4pSIpXG1Fu9f X-Spam-Status: No, score=-13.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Although part of all CO-RE relocation data, type based relocations do not require an access string. Initial implementation defined it as an empty string. On the other hand, libbpf when parsing the CO-RE relocations verifies that those strings would contain "0", otherwise reports an error. This patch makes GCC compliant with libbpf expectations. gcc/Changelog: * config/bpf/btfext-out.cc (cpf_core_reloc_add): Correct for new code. Add assert to validate the string is set. * config/bpf/core-builtins.cc (cr_final): Make string struct field as const. (process_enum_value): Correct for field type change. (process_type): Set access string to "0". gcc/testsuite/ChangeLog: * gcc.target/bpf/core-builtin-type-based.c: Correct. * gcc.target/bpf/core-builtin-type-id.c: Correct. --- gcc/config/bpf/btfext-out.cc | 5 +++-- gcc/config/bpf/core-builtins.cc | 10 ++++++---- gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c | 1 + gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gcc/config/bpf/btfext-out.cc b/gcc/config/bpf/btfext-out.cc index 57c0dc323812..ff1fd0739f1e 100644 --- a/gcc/config/bpf/btfext-out.cc +++ b/gcc/config/bpf/btfext-out.cc @@ -299,8 +299,9 @@ bpf_core_reloc_add (const tree type, const char * section_name, /* Buffer the access string in the auxiliary strtab. */ bpfcr->bpfcr_astr_off = 0; - if (accessor != NULL) - bpfcr->bpfcr_astr_off = btf_ext_add_string (accessor); + gcc_assert (accessor != NULL); + bpfcr->bpfcr_astr_off = btf_ext_add_string (accessor); + bpfcr->bpfcr_type = get_btf_id (ctf_lookup_tree_type (ctfc, type)); bpfcr->bpfcr_insn_label = label; bpfcr->bpfcr_kind = kind; diff --git a/gcc/config/bpf/core-builtins.cc b/gcc/config/bpf/core-builtins.cc index 4256fea15e49..70b14e48e6e5 100644 --- a/gcc/config/bpf/core-builtins.cc +++ b/gcc/config/bpf/core-builtins.cc @@ -205,7 +205,7 @@ struct cr_local /* Core Relocation Final data */ struct cr_final { - char *str; + const char *str; tree type; enum btf_core_reloc_kind kind; }; @@ -868,8 +868,10 @@ process_enum_value (struct cr_builtins *data) { if (TREE_VALUE (l) == expr) { - ret.str = (char *) ggc_alloc_atomic ((index / 10) + 1); - sprintf (ret.str, "%d", index); + char *tmp = (char *) ggc_alloc_atomic ((index / 10) + 1); + sprintf (tmp, "%d", index); + ret.str = (const char *) tmp; + break; } index++; @@ -987,7 +989,7 @@ process_type (struct cr_builtins *data) || data->kind == BPF_RELO_TYPE_MATCHES); struct cr_final ret; - ret.str = NULL; + ret.str = ggc_strdup ("0"); ret.type = data->type; ret.kind = data->kind; diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c b/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c index 74a8d5a14d9d..9d818133c084 100644 --- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c @@ -56,3 +56,4 @@ int foo(void *data) /* { dg-final { scan-assembler-times "0x8\[\t \]+\[^\n\]*bpfcr_kind" 13 } } BPF_TYPE_EXISTS */ /* { dg-final { scan-assembler-times "0x9\[\t \]+\[^\n\]*bpfcr_kind" 11 } } BPF_TYPE_SIZE */ /* { dg-final { scan-assembler-times "0xc\[\t \]+\[^\n\]*bpfcr_kind" 13 } } BPF_TYPE_MATCHES */ +/* { dg-final { scan-assembler-times "bpfcr_astr_off \[(\"\]+0\[(\"\]+" 37 } } */ diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c b/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c index 4b23288eac08..9576b91bc940 100644 --- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c @@ -38,3 +38,4 @@ int foo(void *data) /* { dg-final { scan-assembler-times "0\[\t \]+\[^\n\]*bpfcr_type" 0 { xfail *-*-* } } } */ /* { dg-final { scan-assembler-times "0x6\[\t \]+\[^\n\]*bpfcr_kind" 13 } } BPF_TYPE_ID_LOCAL */ /* { dg-final { scan-assembler-times "0x7\[\t \]+\[^\n\]*bpfcr_kind" 7 } } BPF_TYPE_ID_TARGET */ +/* { dg-final { scan-assembler-times "bpfcr_astr_off \[(\"\]+0\[(\"\]+" 20 } } */