From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 34898385800E for ; Wed, 30 Mar 2022 23:31:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 34898385800E Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22UL52wC032372 for ; Wed, 30 Mar 2022 23:31:49 GMT Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com with ESMTP id 3f1uctu2vd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 30 Mar 2022 23:31:49 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 22UNMbIR007313 for ; Wed, 30 Mar 2022 23:31:47 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2047.outbound.protection.outlook.com [104.47.66.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3f1s979708-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 30 Mar 2022 23:31:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gLzZZI2n84mzrioijD9EXsJ1KpOIo9B1kskY5TWRwkfPIXNmLn3Igl8wT7YkZNjgE+iYecX37nLvd9kYbysyTgFjVBcHa7hsPMvYBFykzbpr157DlQGWQAvpz5a0iAUMESr7/74X6ct5xfuuZ0/N8jc6kOdtVd43TiyiY+sjsxflAGfs0X0JktDST+eQ/owiIyzL/yohxtgX7ok+QV2ANzNBD8yEABzvks5LLztZbSzNXIvzAtNR8lrAK+yOe21uDKcJkWEKbU6sxBa9Ac3wzlFilc4DI1wqV9dWQOMkYJfQkbS1M6X5qfikS+EZP1X3zEhZxyrej7d5keaL3CeKnw== 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=br7AUDaFaVeqJolTbe3+QfAhSAuJrWwC2m13j9Nr5dM=; b=kylisu8goTSrQDLZvIPdPt5B9uOhj6lMAm6T709gZaHrq8svdNRO6DW1cdGdnBzysJVan1GfT2QFMlTQ8wXE5uXtyrT+yDSItLYiB/eqrQuSvLhxu5Stdfc+Iam5EgjRhucNA0EuF1JXGmQlaZv43ng3Cdm4RB4cUou7VJXlz6nluG+VSqfZiAK8F86ppF3VTimI1/UKBxyV3eq65+jUAhUGx8tawpYtviG7cxCevHB6uo8BLu44pz/Hz0NmpdlaJzvD1UieHwJk3E62rjZZDTr9676quVUfCuGKltlmF2E226v4b3NA+Zl/zz8vOec11fqqQaiBLQRb+BPtMXiaWQ== 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 MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) by CO6PR10MB5538.namprd10.prod.outlook.com (2603:10b6:303:135::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.20; Wed, 30 Mar 2022 23:31:46 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::b1f2:a803:163b:aad5]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::b1f2:a803:163b:aad5%4]) with mapi id 15.20.5102.022; Wed, 30 Mar 2022 23:31:45 +0000 From: Indu Bhagat To: gcc-patches@gcc.gnu.org Subject: [PATCH 1/3] ctfc: get rid of the static variable in ctf_list_add_ctf_vars () Date: Wed, 30 Mar 2022 16:31:33 -0700 Message-Id: <20220330233135.1762317-2-indu.bhagat@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220330233135.1762317-1-indu.bhagat@oracle.com> References: <20220330233135.1762317-1-indu.bhagat@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MW4PR03CA0205.namprd03.prod.outlook.com (2603:10b6:303:b8::30) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b8e5ed3a-881b-4362-c7e4-08da12a57405 X-MS-TrafficTypeDiagnostic: CO6PR10MB5538:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dXjYNMioHMBGOfDWjMQjUlosfb4vx/E8dzGURALRLbSNq6k5jz2mun51fCwkhKwz/aGNsc3OUZ6v9D83HCFzTwWH7NERvNaxuYZBuoMhIGjzNc1sq4iV8wW70fpLQsfo4pZ7+S/6o/5eUt4+GAIsdavQaa28OtyhO2APCFS5iMAybdiQ6yzjqIPZd6f+BuYWeondXZaIzNXgAGkvBIXi1Jc6Ow6Fin5NI3cROIglTHFCQuxkD7lIWi8pPuyPy+JukANjVEv6bE8njRaRH9HIwwWHYZblsVUM6tus2XZW+Lxg4w2j1jWThkLT+2HjPkxAQN07rzzJrOb20m9l5tIykKcUhzbugnVPaCKZtIer6jiFgizod68VIBf+3gdaMZD8F+JTmmjrPypXjwKV70M5gLy9c7K9w9hL7+eU1rOfOpAmK7qml2zrKLda2bhOiE420btIU2e/LWf9SqIOaqQFo18EaON+YYJx8WgiieYmLFoVpFCemLCqT259QUjZLTDo05dXti8JeBETHX8TwHKZLK+vyHJQsinXPvxwDiSV5/KDNvC6miS15NoEqmCCu3PpGqVQgAFMae4fKwA6u/UT/Sfeg7CyiFndp/WkfMUZX7CRZz1DeZk6cHUi8npabGyf9KKWE/prlY+dcblVAZm6798WIaGJw/HNg1yO9uFWyx2ri3FfKVqi2L8WB+qWUbZ/FrUpgeYop/qvnyu7Al/pFOkhuL5v+m+9szGiteZ83JI= 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:(13230001)(366004)(6512007)(316002)(52116002)(6506007)(186003)(1076003)(36756003)(6666004)(83380400001)(86362001)(26005)(2906002)(6916009)(38350700002)(2616005)(44832011)(508600001)(6486002)(5660300002)(66476007)(66946007)(66556008)(8676002)(38100700002)(8936002)(26583001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JDWz11i386o/nbyhOcrCAcEx6J5oxXXDA4qBTAg1jYvJAGyDrrofP6GxidAS?= =?us-ascii?Q?kyf8oIUA+z+/8IDH9tgiMvMl/gkFEQoZjDGSITfUnL48fUw4nhMnfeXKUGiJ?= =?us-ascii?Q?WFegE1n+S8yb0ycBLtW606KVlWMUjpZXpknk1dunVnKbzUYDI+XM0eAB78uD?= =?us-ascii?Q?TuRfgutUR94ecjzuBU52yn/+TCQu31uv68qOHSYCvVpXRcsz6cy4gI4msFRs?= =?us-ascii?Q?Y2rOI0fjFFqbG7hjrNdXb4u5eRSFN5TzEPhg+Oh0PJl/sW2fKkbyR4HPt2LS?= =?us-ascii?Q?vwXFxH/D3lDiwuD1h5XsVFr2w76QsVv/yznb9Skrhgj3OSn4zVLoF4AueLFj?= =?us-ascii?Q?kmlly+CwymfhSv0Ak0IWndC7SU7mERh6LVPvuPVd4FXqSCQ2xFyY7bCJ002w?= =?us-ascii?Q?1+Ttx3MdBO/i617dm0lE1esLi9RUmavpPVnnyWWnZnaEIjtfMB6WSJnVLs6i?= =?us-ascii?Q?N+n3M6NonN/Qw+P8QAd+f3B77iN8aZu2OZk1dZXUAaHPo7s4NgK1nPLEVb+d?= =?us-ascii?Q?scaNfetPXTxZcIXLrvjiGJtkWp/qSpBxg/1k+WHEvi2lq9CQ7YUzILEPCrJY?= =?us-ascii?Q?yeegDfcjwtiqhNy8XWrZRSQ1izJpJKcRM/Erww/agFhBLm4YsDekq71JjLnn?= =?us-ascii?Q?pRCqCdePwLJYRx+cvPOxv+bBJrHV2AExGlP+LSDNL4/AU8Epyz51mF4JEhWR?= =?us-ascii?Q?TzVIC+h6U4MbkUy7Vk6zFmJsBuB9WzMU/gxoWHFuCIrITjkuoroXaBOYHB/Z?= =?us-ascii?Q?kDyvDpVPU3h7qO0RxFBaWXGWs7sOAnFNQlssMGoFozp/z1b51Y3a0KrLxv1s?= =?us-ascii?Q?oh4vrci8uQf3VtoDPeTSSq+Czi9CUtyGjVT1g50T0TfIf8Q28WA/UkiUkCLF?= =?us-ascii?Q?t298T2C7/+OIVCrT8NXDQButbs5cM7ZGZWnEd3u2b5C9ovxHckomUa/XSsso?= =?us-ascii?Q?W5BCWHorH7gM6gzN4rLRxoPTYUTlccBMbis8hru5eq0JC5Q+c0+/zu5mx4Yo?= =?us-ascii?Q?CsFrilsJzTtRSO/p4SjolYz8HreqICXxCQ11czBjmLnvVH41sN9dFC/TTQAL?= =?us-ascii?Q?3qP4c/rIlIL5VFdRDP0jSRT3eCKAiIT/BKohHKVQCrVf5hkaebD76pZI38WL?= =?us-ascii?Q?AL6ayMLKe8SvhMX/GcoQY17vaRFB8QaRjrTZaMMUivPcVvA0HB66uL33RaPo?= =?us-ascii?Q?gmkcU4qR8fv/2H26Ri4zK8a0Owro3a0euqzo5RNTs24O5xVX/UvOmCsvYj/J?= =?us-ascii?Q?oAAee3QKjTZ/isrk4Ry7XGrmhrKA8Z9IcBfRS8vdR7+QYbx7BbHCP+WnylGh?= =?us-ascii?Q?dBD7yRYDMAN60lPAXrji8xK+6VouaKXituQO8b6e4WbabP+TAcVEZE4wLb0n?= =?us-ascii?Q?LGxQOkJcTmp3yjsy+d9ntylgBRE5AqZcwNIkZUPUybMailErZOWZvYxtVimi?= =?us-ascii?Q?VR5uP02dIjnVxWXOr+ixmKjPO8n2B6/0Gnq8nNSpZ1nVlcjn6uzaJ8xzyM51?= =?us-ascii?Q?rH7On0P6YcbomrM56JZq1AXDbhwuKnw3yJ2RnhYs28P7PGuzVyaelRM/RuKa?= =?us-ascii?Q?6T4S6zIyOO0wgDD4iBWvsuWcUky+t6II/3ii3Xk3G01KeyOyewLABqYSXudg?= =?us-ascii?Q?ktnNG9IljUxm9tdZIFBJSI2GVZGiWdzgvN0wUg1/aOUFz1RvqNgwr+9uf60p?= =?us-ascii?Q?ttIjosDlSqp/RhhfMDQVvnfk5G+S5Xh3jDifzI5GYXNaHungxAkerq/nMxm/?= =?us-ascii?Q?fByGabL/Aw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8e5ed3a-881b-4362-c7e4-08da12a57405 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2022 23:31:45.7410 (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: H+O6jyuMnHeB63aPQAVCaE5jWNGSsVMp3i9usBVsL2XQdXbxzga+JydGss/Xcn28JZNKYSR2C4h1YG9UBNj2Ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5538 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.425, 18.0.850 definitions=2022-03-30_06:2022-03-29, 2022-03-30 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 phishscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 bulkscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203300112 X-Proofpoint-ORIG-GUID: Gbct4UBajKAao2-GmjWrlgdayvOAZA5t X-Proofpoint-GUID: Gbct4UBajKAao2-GmjWrlgdayvOAZA5t X-Spam-Status: No, score=-13.7 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Wed, 30 Mar 2022 23:31:52 -0000 2022-03-28 Indu Bhagat gcc/ChangeLog: * ctfc.h (struct ctf_container): Introduce a new member. * ctfout.cc (ctf_list_add_ctf_vars): Use it instead of static variable. --- gcc/ctfc.h | 2 ++ gcc/ctfout.cc | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/ctfc.h b/gcc/ctfc.h index 18c93c802a06..4ce756c728a7 100644 --- a/gcc/ctfc.h +++ b/gcc/ctfc.h @@ -301,6 +301,8 @@ typedef struct GTY (()) ctf_container /* List of pre-processed CTF Variables. CTF requires that the variables appear in the sorted order of their names. */ ctf_dvdef_t ** GTY ((length ("0"))) ctfc_vars_list; + /* Count of pre-processed CTF Variables in the list. */ + uint64_t ctfc_vars_list_count; /* List of pre-processed CTF types. CTF requires that a shared type must appear before the type that uses it. For the compiler, this means types are emitted in sorted order of their type IDs. */ diff --git a/gcc/ctfout.cc b/gcc/ctfout.cc index a23d37758019..28a873b2027d 100644 --- a/gcc/ctfout.cc +++ b/gcc/ctfout.cc @@ -173,9 +173,7 @@ ctf_calc_num_vbytes (ctf_dtdef_ref ctftype) static void ctf_list_add_ctf_vars (ctf_container_ref ctfc, ctf_dvdef_ref var) { - /* FIXME - static may not fly with multiple CUs. */ - static int num_vars_added = 0; - ctfc->ctfc_vars_list[num_vars_added++] = var; + ctfc->ctfc_vars_list[ctfc->ctfc_vars_list_count++] = var; } /* Initialize the various sections and labels for CTF output. */ -- 2.31.1