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 43068385843A for ; Tue, 28 Sep 2021 18:40:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 43068385843A Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 18SIHrBq017579 for ; Tue, 28 Sep 2021 18:40:51 GMT Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80]) by mx0b-00069f02.pphosted.com with ESMTP id 3bbh6nsjkr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Sep 2021 18:40:51 +0000 Received: from pps.filterd (userp3030.oracle.com [127.0.0.1]) by userp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 18SIUR5b026417 for ; Tue, 28 Sep 2021 18:40:50 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2107.outbound.protection.outlook.com [104.47.70.107]) by userp3030.oracle.com with ESMTP id 3bc3bhrvrc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Sep 2021 18:40:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bX5siHoWRyGy4whHFx+c7FQ+OML3LWueimi10kbH9m6lmPqHAS1l8pMu5o4DrLRY0aBSQWijR/cbrHWeOtA14ItUO46oR67aMTo7vUVdCVKKD8i0Tg89gp13AzlpuZmliACV1cyCNPD6CalkK/zjxh9ZH22T4ObjdgE4p7Ae4L/N+e+xhMvhf8bffk7IBLJ4EjpDMJXI9jsPt1hxi0xiO4h1TxRdXMHr8bv0m3HnnOpbgCMMoMT95xTYyWSsLj76WdcdbvkbnyVVE1b0NHPQWtoRk5r4HSscNgulZ5v0eCvJljKW9q43tX6N9lh3LJKVOBW3KGZ5a8pZB3rU/v4XRA== 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; bh=d8+nwGrElmJctdXILx7gxFPPEh65cBfAHyVJ7RQ9Oy4=; b=P2c6rhsMPXWBTcQImlv2BQNBzhsjbeo/tsSQLZXYXGVcqdiINBEoEYKWQEY2uALL2vPB2tKGbESQQhiyNcNRtqDR/9kg7Ie+Dq3Rtg+VjopJOIHDou5K3Pvq9qMvDWmQeMJOTUS1zYQEst2MoCT9AsftySJCxacdlsB+1H1BvVzfeMwySzpK7/nJOwn14QQEfGZWxqb0J8wyJtj3OIJPKw1wk/wxVPN3KgZL+EjvblfyLNwDxri/tM0g5wf77NH83Lf7uvIChmc5nPnpiPEoUN2lbFJdUgq/Vp5PicsREMxl+5clRvGbGsPOJdLgppszmKvfhe81O/1LYRot8Jpe0w== 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 MWHPR10MB1246.namprd10.prod.outlook.com (2603:10b6:301:5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Tue, 28 Sep 2021 18:40:48 +0000 Received: from MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::1180:46c:d426:11b9]) by MWHPR1001MB2158.namprd10.prod.outlook.com ([fe80::1180:46c:d426:11b9%6]) with mapi id 15.20.4523.025; Tue, 28 Sep 2021 18:40:48 +0000 From: Indu Bhagat To: gcc-patches@gcc.gnu.org Subject: [PATCH] debug/102507: ICE in btf_finalize when compiling with -gbtf Date: Tue, 28 Sep 2021 11:40:43 -0700 Message-Id: <1632854443-6232-1-git-send-email-indu.bhagat@oracle.com> X-Mailer: git-send-email 1.8.3.1 Content-Type: text/plain X-ClientProxiedBy: MW4PR03CA0336.namprd03.prod.outlook.com (2603:10b6:303:dc::11) To MWHPR1001MB2158.namprd10.prod.outlook.com (2603:10b6:301:2d::17) MIME-Version: 1.0 Received: from ibhagatpc.hitronhub.home (24.80.24.133) by MW4PR03CA0336.namprd03.prod.outlook.com (2603:10b6:303:dc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.13 via Frontend Transport; Tue, 28 Sep 2021 18:40:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c65b9c0b-5e23-41ee-ff29-08d982af7d65 X-MS-TrafficTypeDiagnostic: MWHPR10MB1246: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R5ffBF9BD1b2YOSyBL0FOXVnuEhaV/qvHmizFU2FKjmfXcMXWCLLd6OJTmaeC64TeTNK/2N9wCaeCNfKnGteq84y/85M7WAq5+kxIOp7h+5MPSkvffESvDoKD6H+yFUAmUTScxdgQ1RJuCYlIQSoXpzHd/e8upuzs0QvfDAcgtgjEaPX1FUj74gfYgbCboK6Se4zUp/szH+I0bbauPvBauTroSQ93O0CqYg68LlQfKqxbfmDI6GZWdwxM7A5WAn9y+G0nfeLMISsi4dAJrNgs7yuee3WB6B7GuVTEHOe6ZCCS3qZVkbiwV36sAETt2yPaf9fD15mnhmhZu+HrLaX9VnAI1pRW01E08Si3B2TljBxAyiW4ClMDEvREBKrV0SiFAv929EQSivSXtIO88g04TEQZdUbEwCzR0F3p9z845/T5SKKqaME3Y1k2sQTDRJdKQdM0URxRF8oSYlQy3TpNz0ZG6Oum9VnLYYhWUnwOfmoa6MIHHJ+1kJaS2BWol1jIBdLSnPyM9jkvs+SvLK4dH0DozcMYzleWC8q7hnQQUOG1NRFccFhhE8FEDYyW3Z7FH/mMXSisyTxUlD2FXSCEszCcN+6rI4JRNGBbTkU9KkRDdaGZtAhnjCYi1qapQiqo6/py29MIekIxFLpHY2HOK8/k2xVDSn8J/RdvGOAzdgcJbzX4splgggolidE2XiMyU6rKfN2bCW7U2sVa94mNtPdgbIt/6Q+3oqUtVOsW6njRKi4oxYVZm1WCkGos7hq6ZjYs4LCB/QAjoqBhvWNtC36N/G9aB2kAOmammapcBY= 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:(366004)(2906002)(66946007)(8676002)(66556008)(66476007)(26005)(6916009)(52116002)(5660300002)(6486002)(6506007)(38100700002)(86362001)(38350700002)(83380400001)(6666004)(44832011)(316002)(186003)(8936002)(508600001)(36756003)(6512007)(956004)(966005)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?k5L6/IVo04+4CjSp2jxoRhxEeYuFsdggTTaaGj5zUXudEoL4OZdlIvmcytoC?= =?us-ascii?Q?8M7zcrnnrN6sC5TV37PFMdUzPSybUDeQJ7gK733tG0f/SGQlCfWuPBGUZ76p?= =?us-ascii?Q?yY4BKggw1U769z2VEbiE6AjU5qGMVRj2cHeNBy+C3cRISwcl/UC6HMXL0A7s?= =?us-ascii?Q?WJeuL0gLwI8LNr0LKilEkBoq3TB3UqLdejqn3NffvZKDMXgm3JYh7aqkoP1Z?= =?us-ascii?Q?QhMZDIS98y0V74VGh/TaGVKFukUL3AapXwlYVhSWymd6IH0R0ibu3jeoL25l?= =?us-ascii?Q?Hd2nwSwpySXx0MH9EIzbuOWDgfubAnAVKTO4PKMOM2HZWElE5cwYCez+fmO0?= =?us-ascii?Q?12UGKjl5DqDEe6Emnf19CEh5yIAr8704NgEcEPh5l5k3V0XVG5lLvIzf4agj?= =?us-ascii?Q?7SOKYugReQX5nuZjHqxNGTtyHQEnLakBsdlCBhx6o5nZ7SEKISbiWviDL6SE?= =?us-ascii?Q?cKrYAN5Nr25tIC6YwiMButRMd8iDupkexytQcJGgBPt4PtoHQEObOzTwY8js?= =?us-ascii?Q?k/Ee1pKNwN+bP/KNfSMpgZ33smZTN6ht2S6H8SQY9VMHkxyqDX1z534opcw9?= =?us-ascii?Q?HzF5BqP3w3yUB0OcTEUcY/2WMqbY05Gw7QYT0NXrCNTw4eyhcO8m0ztuVaNE?= =?us-ascii?Q?1BdVR1dn6947vkGAi+W7ijlJhz7cxxyJH1cQwPF6vTyAd2gHrbS25Iz90v8P?= =?us-ascii?Q?A7LvtLi1UngLeyASmpfKQFZHGA/4TqJsgGfmJ8Nn8E3y91ZF7Sks6M9t7DZA?= =?us-ascii?Q?zibKjSqISiBc1yXERr1+aHvVlOCtnVPvrtJdCOw9GgJhe2MqfNoopedOVaTR?= =?us-ascii?Q?SmKFmXWVH96TMXdszA+D7N7ezxpdW+tk+9PXUYc3J15Wq/+KRaffWklc4ODi?= =?us-ascii?Q?XbT41PKbzMw9kkdZC1c8tTt6w701cttzBauwehg9JmrIKfS/pSacpBA8fj/v?= =?us-ascii?Q?9KT4j6cFBNbIRk/eToVbumhS+HxXIj28QlR0ZGCXrpjM7T434TrgzE3FYN8h?= =?us-ascii?Q?SbEiivqw9jAxGw0ipGb3KyA+uOEj9v1FHTQpduSSQRJnQIqmtKI9l5uj5fZL?= =?us-ascii?Q?D2acmoGo3NmHph+3piVVKyMdFxr9PPepAjE5n4hmhDRJvdrRItYMAudV5Oda?= =?us-ascii?Q?ZWQwLnX33IolV3U2pvK8DVXLEafVGBM3fCEpoWse/Pob0XXj8xE2sx3Yalu2?= =?us-ascii?Q?KCsrl83+6LFnMOWl4HhddQV5nKJmNjS0ek6K8wXAwG/yyaANGGk7CA0PHZlR?= =?us-ascii?Q?pxlRqZ1fHHAyCkPOVfkMYac3VxHY6o9VfGI3bmGdeLGzBWtLuyercFAX9ypj?= =?us-ascii?Q?IHqxr0rUrzB4rTm7aNPaqsQ+?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c65b9c0b-5e23-41ee-ff29-08d982af7d65 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2158.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2021 18:40:48.5809 (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: XL8v+1SueWghF0ycpVzcAJQ/ZC/E/Tvj+JOIT43ekhWVR9G9Uc6tUWUNFpx4RiSYvWbPDmT23o6g5xstAfKDSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR10MB1246 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10121 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0 bulkscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2109280109 X-Proofpoint-ORIG-GUID: JZ8_sVNVqximleI-q7FPJOeSETmnEx7G X-Proofpoint-GUID: JZ8_sVNVqximleI-q7FPJOeSETmnEx7G X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TVD_PH_BODY_ACCOUNTS_PRE, TXREP 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: Tue, 28 Sep 2021 18:40:54 -0000 Fix the free'up of btf_var_ids hash_map in btf_finalize (). Testing notes: - Bootstrapped GCC with -gbtf as an experiment. - Usual bootstrap and regression testing on x86_64. - BPF backend testing - make all-gcc, reg tested bpf.exp, btf.exp and ctf.exp. (tested using David Faust's config.gcc patch posted earlier https://gcc.gnu.org/pipermail/gcc-patches/2021-September/580422.html) gcc/ChangeLog: PR debug/102507 * btfout.c (GTY): Add GTY (()) albeit for cosmetic only purpose. (btf_finalize): Empty the hash_map btf_var_ids. --- gcc/btfout.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/btfout.c b/gcc/btfout.c index cdc6c63..a787815 100644 --- a/gcc/btfout.c +++ b/gcc/btfout.c @@ -70,7 +70,7 @@ static char btf_info_section_label[MAX_BTF_LABEL_BYTES]; converted to BTF_KIND_VAR type records. Strictly accounts for the index from the start of the variable type entries, does not include the number of types emitted prior to the variable records. */ -static hash_map *btf_var_ids; +static GTY (()) hash_map *btf_var_ids; /* Mapping of type IDs from original CTF ID to BTF ID. Types do not map 1-to-1 from CTF to BTF. To avoid polluting the CTF container when updating @@ -1119,12 +1119,12 @@ btf_finalize (void) funcs = NULL; + btf_var_ids->empty (); + btf_var_ids = NULL; + free (btf_id_map); btf_id_map = NULL; - ggc_free (btf_var_ids); - btf_var_ids = NULL; - ctf_container_ref tu_ctfc = ctf_get_tu_ctfc (); ctfc_delete_container (tu_ctfc); tu_ctfc = NULL; -- 1.8.3.1