From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by sourceware.org (Postfix) with ESMTPS id DD3E93858C78 for ; Mon, 7 Nov 2022 22:43:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DD3E93858C78 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=oracle.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=oracle.com Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A7M6c6k011362 for ; Mon, 7 Nov 2022 22:43:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=corp-2022-7-12; bh=9CggtTxgIbehy+vWev1m7qWV4IdC/2UkfV5/EnNeA9w=; b=yhRD4zKyx3f5AiPEf1VBDKOHx0aj4JpLmOOPr8gmKVuquSfJC9c4paGnhNoYJZ0Y4vi4 keWlIVIk7vvVb87u05XNFoh8zMbM83OLbS7UnRJY0E2StiDhactcng9cdDLh7260eJG0 SooXfBDN+8JxYtnEtU4dKdtf6ApWcUUnsdlqyxLtLjRB3nBUhSuFFxsidbl0ERE5Amz0 R7gfTIZKIuKXz+qWJg1gYOLfovmtRYbYOSaEJ3wMveOIyj/A9bsfyaNQ8AHAPpo5f+h+ v84zraFDVaQY+tCJK6eosQu4DtNmu0iX9z/K9ArzfDzxU8XTLlFa3cPdNbo6W/xbTDE2 3w== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3kngnuwjd0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 22:43:07 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 2A7KwKMw010890 for ; Mon, 7 Nov 2022 22:43:06 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam07lp2047.outbound.protection.outlook.com [104.47.51.47]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3kpcyn2uyx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 07 Nov 2022 22:43:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ND5maoTAWenYBhYupbJbTLNSulUP4+rKhsDgQBZSk1o2+S1wJdSy6WcSqsRKKKNk67bxm5N3QtvRO2op/Ub6HRmGpQ6EsoWszMPv4kC5g6+cUL5Lx4VWgff+3u332MOJ3QetoJbgyhxXZS/fq8ALneTknRXvyOTRd2CBQkse24qe7TjQzuApBI15YTcDkh9dp4lDf8k2TuuZf4pGyREX63JL2tx76E+6/bI7D0AEdt9Ap0sbZxTXUVHpNBUVaaY1ZYWaf4iL8XYofG4UxwSahRoI45tDcTE/THXlLCLo8HwyTBt+C/RWDB9N3QAG2RXm6TRoZNewcNayfTTPZefeLg== 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=9CggtTxgIbehy+vWev1m7qWV4IdC/2UkfV5/EnNeA9w=; b=dKM8J4cxlnPJ/OcdAK6jpbhfkb1J5dZAjrFxhuYS8ARgC9sD3jhq7ou8PtcKkWW0J4sxGYudS5mV6YdT9/+5gnaVQp6zSrNMsqF8XSpk42D9BZz84Kt7TMFRdHFfcBGGBspY1iqgf0l8I3FHdcO12WcBBkxM8JAFSqzaR2XaciMKGsbscWNrhDRTmG+KQtV19iABNXoYRUX2HPqB0ZYP8GuKZHW0S3uXI64cmgPgT356bN5vx47vZhxa+NzgsyARCt3baZtss1VwMYFvarkaWbor4ApEqKiswPjeAYaUeLzR6PDm+dFwZxu/q+5lZGoRKFnGganQMve7PH1jZcZOjw== 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=9CggtTxgIbehy+vWev1m7qWV4IdC/2UkfV5/EnNeA9w=; b=0FjljeEWQunT1EVEfOdnlC7QlC3sa+Lmqc66ASELbVNBewOxJejureIVimh+ycIoa+/zMJK/AafQWqeuI5bp2CjJxKnM/h9VAC7xLaDdtKKt/L/883zlffgasdxfByOYQ0kuhrWhgvwdpNwnr6ulkvtvvkHJx/yOp73APf0Bn+g= Received: from MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) by BN0PR10MB5191.namprd10.prod.outlook.com (2603:10b6:408:116::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26; Mon, 7 Nov 2022 22:43:05 +0000 Received: from MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::dd41:a422:5763:8848]) by MN2PR10MB3213.namprd10.prod.outlook.com ([fe80::dd41:a422:5763:8848%7]) with mapi id 15.20.5791.026; Mon, 7 Nov 2022 22:43:05 +0000 From: David Faust To: gcc-patches@gcc.gnu.org Subject: [committed] bpf: cleanup missed refactor Date: Mon, 7 Nov 2022 14:42:54 -0800 Message-Id: <20221107224254.12230-1-david.faust@oracle.com> X-Mailer: git-send-email 2.38.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: DM5PR07CA0105.namprd07.prod.outlook.com (2603:10b6:4:ae::34) To MN2PR10MB3213.namprd10.prod.outlook.com (2603:10b6:208:131::33) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN2PR10MB3213:EE_|BN0PR10MB5191:EE_ X-MS-Office365-Filtering-Correlation-Id: 4cebd75a-e55b-49f9-ac9c-08dac1116f13 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IF+01BHbS0D7Z2+7YdFTo94TvyQQbpsLykYAK6qj6tPCnNwhA0czovrZPmb0GQpDq0kpgzeOhHdpmMH9wO00tEp7LXbHIgwQCkjPlTMT68jmjQ2JZr4RMrvLK40bveThgm2bg5gUkhgCJfP94qCy/Zr4/vHXNOh3H9FZeCjwyiYqWgfCR34vMqNdwEfqK1mdofX80T9oV7emwBUvCF1ICbEH6JzjxIw+4SqUKi3x0ViWQ4h4oBUH03vyj+GcInXjsOeIx9Pxk4AoF4TaGX5DNOriWXJYX5DKtSuf4Uhy1IUtp6BMKNslV1e9EL5peNwzLdLLgIs14RYAne+pAWlKVhvlkPuErGpzQ7JLlJfCsVENlCMv910cCA2iZRcJOKy/60h7grWdx+lsQyfL3lrXWUN8FiC/9L1SqDpSi9WJIto0vNwJb1pn10C7p9aL3vyxv1b/wNAbRw+QkllALh7gAAhw2PoAAE8wuWkOzr496qDyv0qNEmSegC2wEq8JzY1FW6VJL4/WoCrSHShhxg8x2InyNraBp4J5CqIU44aI2mOGjuv2G9LESFN+M6hCmRjYSLnr9M3K7ApjBMKTNjQ+NTUvSENuiodzjHOicqcC6uKqdXnBhIm0oFpiB+rSEGVMSmUNQDzhTHybIXiXfOs8VPMAYmBo5HNsboDnY/sJHq4/FBm6t0XjVKRGfaX3Q09fdjYE+VcE5p4a/n11y5GM6g== 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:(13230022)(346002)(376002)(366004)(39860400002)(396003)(136003)(451199015)(1076003)(186003)(6512007)(26005)(6666004)(44832011)(6506007)(2616005)(83380400001)(2906002)(6916009)(478600001)(6486002)(38100700002)(41300700001)(5660300002)(8936002)(316002)(66556008)(66946007)(66476007)(8676002)(36756003)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jkCfKCmBWvV2NfBj6u7qz0H7VG5lPsSAQP1acrHyg0I7E0JrwaxUU2aopFgQ?= =?us-ascii?Q?3WK7iuxUBt8Y5XPM2tMg+rmSsI71ON8FgV2drCzbOHTuw6ciJnQwiYo8ASsO?= =?us-ascii?Q?R72JOqFPrDmOlcSv2eDz4T884BNiugQucbTADJyEtEmXoYZEUsICO3VGMwZ0?= =?us-ascii?Q?m+6lVhQvABJj8l5K1VsGISjA1M/bC3kDfmx0sVeWy1ZoMBTEN5q9kHjcpAQd?= =?us-ascii?Q?4HLEXx5jF9rHOCF4AX1llBtm2uriaQnzdAPHQdZCQX8tFtWsmZyVOAUkpPnB?= =?us-ascii?Q?Oz6+YRN5HdbRnvTEAXZnzYZ6rmvZnriWQeMrZrV5LO849117IQaDMyusEADF?= =?us-ascii?Q?U1dJuSfFvrdUV5BAp9KQaZ97+2aAEPDP8Zs8j3rY3yAqHMUilT6cA6I1K5qP?= =?us-ascii?Q?Vh6ILMTzGS+2LKJvOI2FDo7SvyPQdG0VeCpSFa5TGFpbQkoUEUM/dFiqtzxe?= =?us-ascii?Q?9kc1ckbfOz6vPDrZRt69+vG1C5RAfVIFcg38Dm8iyMo3jkiyqaZGe8vtp19u?= =?us-ascii?Q?K83Te0MKZA7AQe6qVMqbQsCJlRe3AOLFmjmspq5ez37P5DWavwILd0HgMD7/?= =?us-ascii?Q?NPLT9BbddM30vcwp41CzJsh5VHdwm21iuQvcgYUlvC7AxavG9SbM913BnX7G?= =?us-ascii?Q?r+ejAjC2oZpiHMGH0YfVcZfsbzCOMGCIYpO1CgcR7aR99YjaxH64RAxvcfiE?= =?us-ascii?Q?mKaD34ZwAkozO70oyptF/tnQfynrnH+2LUfo1Dhvo6Knonc57czjVkhLiOCK?= =?us-ascii?Q?o3MQJ1bv1uWDaHgYqqyzLNU7MPXjjKHWK6xj2O52JeVzSCaMKeICB5XbQW1m?= =?us-ascii?Q?p5Uv+5DzyOkRWw4hE1TzUmsXnWARjWm8mLxmW3etlOaD9jN3lbOusbFwveQ/?= =?us-ascii?Q?UMOCDbCa7lNRjfst7FegbL1M+0ku7DHVKpW0s1Xurnr2e/ORNTEezyD9DHZL?= =?us-ascii?Q?HS0wHTjg1C3303c/CIZ32WwHamub4JF49cNXlIElDkg54ljOykOQyNx05kwQ?= =?us-ascii?Q?4Dvk4sQb2xgEz/eQm+ZgZFi1YaZTkK8MceJfUyWpbO83iuNYjZ0DLc8jVRcF?= =?us-ascii?Q?kyPXi+ufwgeDOWOdSjD0YNucmD0sBOg6v1HOX2Fqea4sWCTlqCcypgOiG+c+?= =?us-ascii?Q?NyoK1fuWk/qnDfDs50PQAhRhEWcelWbuyndaCxaRuw1tQcnyHf9fRXaVy7cl?= =?us-ascii?Q?tE+7A3D0bQve9bKorMWksXjoaOnE1i8TOrUVgLSHi7KgKcAK/1QT7K0QM3Nj?= =?us-ascii?Q?qVsLtXyEVraoPnziM0XsLQFCeNg/iDWzeXBuj9tuBM8wZdnM+1zxfcHvNvY3?= =?us-ascii?Q?vPa5zCvmI3tyFxyFkksH85J9j2sm9ACyueM8oJ8EmswixAvyKbhvJhAkOe02?= =?us-ascii?Q?gn9oUxkOccwbvmqS/xJULoZtzbgb4EmSRTB9c1w8DnHDyi/FydxDGItd52hF?= =?us-ascii?Q?34Lt/ZPLcoxX0kaym0Zf5ff6PKUCfHMYvrfWIqZ0NdtsN3Vi/QwVEIwbfiSl?= =?us-ascii?Q?nZDxz9OapsMTOZeF1rCaDDWmjiQHvUux66rjECnM+v7gQ+4CMAqsvEsnDCBO?= =?us-ascii?Q?5EDBVFAypQ6cnENfHwrHvP81WkBXIk8ebqeLSNBY?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cebd75a-e55b-49f9-ac9c-08dac1116f13 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB3213.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Nov 2022 22:43:05.1011 (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: cRUEw/C9Z8BenVj8VfsSQTN5JbJ8mSFr1BTB/thgDpcgf78/0E5HdRnCkXD1admBcVpklFri0NasnonHxOxyDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN0PR10MB5191 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-07_11,2022-11-07_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 malwarescore=0 adultscore=0 mlxscore=0 mlxlogscore=999 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2210170000 definitions=main-2211070171 X-Proofpoint-GUID: GN9M8Ptj7bEjG6rpsUw3p51hHXu3jxmi X-Proofpoint-ORIG-GUID: GN9M8Ptj7bEjG6rpsUw3p51hHXu3jxmi X-Spam-Status: No, score=-13.0 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_H2,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 List-Id: Commit 068baae1864 "bpf: add preserve_field_info builtin" factored out some repeated code to a new function maybe_make_core_relo (), but missed using it in one place. Clean that up. Regtested on bpf-unknown-none, pushed as obvious. gcc/ * config/bpf/bpf.cc (handle_attr_preserve): Use maybe_make_core_relo(). --- gcc/config/bpf/bpf.cc | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/gcc/config/bpf/bpf.cc b/gcc/config/bpf/bpf.cc index ea8ca64d1d6..fd4003c2bfc 100644 --- a/gcc/config/bpf/bpf.cc +++ b/gcc/config/bpf/bpf.cc @@ -1731,7 +1731,6 @@ handle_attr_preserve (function *fn) { basic_block bb; rtx_insn *insn; - rtx_code_label *label; FOR_EACH_BB_FN (bb, fn) { FOR_BB_INSNS (bb, insn) @@ -1762,28 +1761,7 @@ handle_attr_preserve (function *fn) } if (is_attr_preserve_access (expr)) - { - auto_vec accessors; - tree container = bpf_core_compute (expr, &accessors); - if (accessors.length () < 1) - continue; - accessors.reverse (); - - container = TREE_TYPE (container); - const char * section_name; - if (DECL_SECTION_NAME (fn->decl)) - section_name = DECL_SECTION_NAME (fn->decl); - else - section_name = ".text"; - - label = gen_label_rtx (); - LABEL_PRESERVE_P (label) = 1; - emit_label (label); - - /* Add the CO-RE relocation information to the BTF container. */ - bpf_core_reloc_add (container, section_name, &accessors, label, - BPF_RELO_FIELD_BYTE_OFFSET); - } + maybe_make_core_relo (expr, BPF_RELO_FIELD_BYTE_OFFSET); } } rtx_insn *seq = get_insns (); -- 2.37.2