From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by sourceware.org (Postfix) with ESMTPS id 361BE388458A for ; Tue, 22 Mar 2022 10:45:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 361BE388458A Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2052.outbound.protection.outlook.com [104.47.12.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-31-Zuq_P4X_M0us07Ah4wJ-OA-1; Tue, 22 Mar 2022 11:45:29 +0100 X-MC-Unique: Zuq_P4X_M0us07Ah4wJ-OA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BeGUHhdmxeMTynjJ4j+9Aj4+ee9FBNUMHt9lp9KChW1riqb4JbAYLBCu0YdT6WbdezpnTDOqtLe1gJdXmbOZ3lu08wA6baZ90yr3GjgrQI0R4lPbkMwfH1YNA+CimJoJTMcyj5DlFJUGYHwcAHYgt1zTphaa0Y4myH0PjGATYmkuF2zcUnbPguLxJ+DYoykdDGlBV7vk1aYR/jmf6l0qB1IexED2J+4Fpyw4JqrMjUgJV9S2oBpiXTIMhYgl90pGhuEY4j5FdNt59tQYjDVpMPh/Na1tkVjswycqU5/ndexl3GYcF+H7IPIk7QlMIJL9HgS+C2tgSa4NyJ4viAbnzg== 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=pIBWtgUdvbFH3K9QJ8tKLkVGswzOuy3p8BmYMi7pcHM=; b=WAlakpA4882pdftIWByf2hgM+IbS8aBkh6iUsqqGA2gGaBF44COxfYFc+0xur+jKqi7FD/uWS3cYe0wqY6F2dIFdnEGYn3Jxjq6Ko0seivUvRdba92Umr94N7T/cWl7gx+hN8YQHxmEP5U9vW82VZTt3g5lCWhUYAOSRl7TqjTrvw3FFqMAiqXhbE8Ufl9a8Esp44r1JjAsu5VPP9vemZZNDwu5bEvwP/0C5iomFcEMT1dAM6hdu1W3XsND4tLRrS0uLHzQQiqj1OelyVKS19swy+DHOGifPwcK0Lw0sbeRVSFzUnwMJlIkEclDSA6GpFha3tBYf9WiIRIopeLEHcg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) by HE1PR0401MB2426.eurprd04.prod.outlook.com (2603:10a6:3:1f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.16; Tue, 22 Mar 2022 10:45:28 +0000 Received: from DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::fc39:fd17:1086:307a]) by DU2PR04MB8616.eurprd04.prod.outlook.com ([fe80::fc39:fd17:1086:307a%6]) with mapi id 15.20.5081.023; Tue, 22 Mar 2022 10:45:28 +0000 Message-ID: <808cc5ee-e669-dcf9-2154-42ab7144b81e@suse.com> Date: Tue, 22 Mar 2022 11:45:27 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: [PATCH 3/4] gas/Dwarf5: adjust .debug_line file 0 checking Content-Language: en-US To: Binutils References: <5dbf0004-0b8b-2a1e-4c6f-f86538b0dee6@suse.com> From: Jan Beulich In-Reply-To: <5dbf0004-0b8b-2a1e-4c6f-f86538b0dee6@suse.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AM6P192CA0095.EURP192.PROD.OUTLOOK.COM (2603:10a6:209:8d::36) To DU2PR04MB8616.eurprd04.prod.outlook.com (2603:10a6:10:2db::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4e3ae08-ff5f-4a6c-b981-08da0bf11477 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2426: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: tzCpdGeZnUKMEMWjfIJBMQnSBNznIhQeN5ffQ7dQ7AmOCH61orsM5EDQz+Gb3ezWeOf3YTNuB1Ccj3UnQtZAlT9eFUFQkhJ9uCQ4ePgikCdXolTPsmsLfvvUMWePW6G7s6G4N+6CJHA5+Q/qCpP6EnMYrzsFXCqfkXbkB4MUVtq4tH4H1oIVRVKl2kJjFHHr9n1VhCvvLoYXxx8ONtmlz2Bftxuvz+h89wgEFCnly0CUb6QL+NuTgqBtZsKvlnsJ7QXFBrBkuBRsdMIDnXOIb1qdC+tWQtYsDclfHM6hZtXCNAxABub2373nKKzYtsp1j+8Q06RlgGDsvQCucUmk8tjhMtACEGIlMPrIHslZ2VLJZBADU8quLOWxYNHgxxHhO9G5gIruztfbciKCce+IcxxBuxgT+3kXJPCOF1TECkdhIF1h5boIubRnPPRGD/i7kjGcndN7rAs3/qAvrEMzESO/8waGW1U2aG3ZWwqCzFwitntOkctZzolMIxWpyeWKgGmhaZ+cgPRozYCaRLsQ5Q6pfQul4W+IiB5ElcgDeikckGLhcCmwwfxX3A0gfmCTvRa6Vcolc0zdF+o0eCHtfwq+MT/J7+pt19Mr2rjBq8vgTp9Gmdsgq91NfVuy0x7RqqZLumJiG61qh342nMw9A8vV3hSsJFB8P5rDmdsC2t5QGxZ/3pOA8V7ck5b9lVgUPWYh8eYg8Zn7Vq6NqV/IJBsuZsyePbwtOv9tIExEst6dBmUirXDf3/zoalncrtr2HvQ6PFkqxUBMP9X3WuqDYw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8616.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(38100700002)(6486002)(508600001)(36756003)(6512007)(6506007)(316002)(31696002)(86362001)(6916009)(31686004)(66946007)(66556008)(26005)(186003)(66476007)(2906002)(8676002)(5660300002)(2616005)(8936002)(142923001)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eHJXZndwVFNDd1FwNXBreDJNWWNpTzJNZ0ZtMTV0cmsrRDNDaUdrdmF1OWt6?= =?utf-8?B?WE14S2lXbitPV1lmdVRCZUdNQjEyTm5YQno3MGpnOXJJNUFLZ1g3SGVEM1pm?= =?utf-8?B?YkFkSlFqaE8xSDVWYTI1YzFZM1B5Wm9mYVoweGdZY0hEYU01YW1sQzV6c1Zh?= =?utf-8?B?TmVGdEVkUHhPdDh0aUM1Rmt0dU9MdXdNQWU4TldLY1NpSEdvOE0rNjJCRWhx?= =?utf-8?B?dlZ6NExQcGlLZmR2azFjRWp2Wk1Yb05EbUxOYzY2UVFXM3JHVE9OOEpOdncx?= =?utf-8?B?OU96K2dqNlIxNDJzKzJ2dWNWd1JNcEt6cGo5K1llV0oybDhHZDN3eXAwazkv?= =?utf-8?B?NUVpekdzQVNOK1FBdFpoRDNGZnlIU3dMb2hobiswQnZSQXloSUVjUXd0b3g0?= =?utf-8?B?STRReVdoRkFCaEhKU09SY016R1lscEh5aTY5enBXY29iZUVWenN1c0d4Zzd1?= =?utf-8?B?a01lZytxNjdXRUV4SG10VHhJQUFpQ3laSHpxaXp2VWFGREhaajFRMGVyVTND?= =?utf-8?B?eTFtQ2RkTmdETEU2d3UyREFYbjlZYlNOY3VMaS8rbDFtbFllM1pubkhMN3M5?= =?utf-8?B?RjhhNXd4VnRaUDhmUDJVWXRoKzJMa0JLc0xNdGxrWlZmaVlBc2xTL01RanNF?= =?utf-8?B?akRkNnpwWngwNVpCa3JlekU4NFZTSVNDZVdGSGdDNEhvdFZNak04TFAwbFY3?= =?utf-8?B?VGp0S3kwVWRJY2E2T2tqUXlqNnNrbWNVMDB6eHlzTjNMWFVSVnNKaFBKYUFj?= =?utf-8?B?STE4STBhWmQwM2YvU21rdDlVOHJtV1VBSGFJZmMydlpNZ1JUR291S0FVZU9P?= =?utf-8?B?Ulk1MXhNNU1YS2l0eDNldDVSL0s3ZURuTzV0bjBnQVAwUW9kYjY0bTBobE1p?= =?utf-8?B?dklJYkY4Ulo0eXl6VGtmRGdYbmRLSjFVSzF0NFB0SEZMOXg4QTgxeGJEekJY?= =?utf-8?B?M0hzVW5JOWJ1VnM0ckpBdUVzME5GcXBVL20xS3orbGtUc0FNQVBDcE85SmNh?= =?utf-8?B?aDExeFJkWjdpMVViWkg2NURFb09SbENLT3FBM2lYZnhTNG1xb3ZoK09pUHlT?= =?utf-8?B?RzB0M1c3NVdkaExQWWl2aERocDZGVUYzcW1ERTFGc2ZIcVlwUHdSREdXb3hp?= =?utf-8?B?S0VQclNwUUxVeEFid2FtenI4Q0pydkhrYVQ1ZERaQUhSTGE1bExpZzU3aXZR?= =?utf-8?B?M2NNeC9GVmErcjZ4ZmJlWHN4RE9BT2pDRzFzL3RnUEpIUUFhZ204d1ZpRndW?= =?utf-8?B?cUkyam5GcDZScSt2MXpHN2NNckx4WlM1c1J1bHNCYW11dVhGWVNicGRGOEJk?= =?utf-8?B?Ry8rYjRraWdPZndtK3g3ZmZiMUYrY1RHZGxKanZFU1VyY3d4UUMzOGMvT1dJ?= =?utf-8?B?MTNFblA1QlgrdFZTQytzam51YlZrMS9PSHV3RERHYkJwOGNscms3T3pMTFB3?= =?utf-8?B?VFhlTWIrRzR5dEhyd3BXWmJvdkUrMVRSYjh2NlhHSWJpZ2RoVUNQc0VvMEI5?= =?utf-8?B?ZGdSeHlLYVRwZ0xYL2J6RXFzWUZrNXM2UE5paHZFMUpreHBYRXlLMW1xdVMw?= =?utf-8?B?dEorbUxuam1UWFB3cFlNL1Y1T2ZVOTRyYU40SlNoZVlCTm5UbUN5aG9zTmpO?= =?utf-8?B?RGxqQXhsVVkvZVJLQVFWMVdXY0IyVTdkVGozMUFmM0pKTE5aWFh3R0JUWW1R?= =?utf-8?B?bnJwUHpsb3VkSWpsd04xRm9FRUJ3Q1BQTWJNK1dBa1JEblh1bEw4c0VoVHQz?= =?utf-8?B?a29YZDlwMVdCcUE1ZS85OWxiOWt3WGcvN3JJa0UwVGRva29jUUVpUkVqYUhl?= =?utf-8?B?OTJLQWxWcnY0ZDJsaXc5QWxqcUdkaTdBcTZoMzFEcnNLSzB4ZEVTYlY0Njl1?= =?utf-8?B?RzlUUnpiNk5jMDBIeVZiMU5ydmRwcm9HWWpBU3FyK2JMNVp6Y0lxN0lBT05p?= =?utf-8?Q?DhPb1OnrHxf6ijpBPF2zwGAID1QVGFPX?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4e3ae08-ff5f-4a6c-b981-08da0bf11477 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8616.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 10:45:28.5854 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qCpZCn3a5sPUI6ZJ1KnWX+NfOwVHQNkaxgoDAAR4OziGSx1B6tnDJuhNpH6Sm4TWL/8zHSsxtJ1NrDsIhwPvhw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2426 X-Spam-Status: No, score=-3031.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, 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: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Mar 2022 10:45:33 -0000 First of all when a table entry has a NULL filename, the two inner if()s are better done the other way around: The 2nd doesn't depend on what the first does. This then renders redundant half of the conditions of the other if() and clarifies that subsequently only entry 0 is dealt with (indicating that part of the comment was wrong). Finally for there to be a usable name in slot 1, files_in_use needs to be larger than 1 and slot 1's (rather than slot 0's) name needs to be non-NULL. --- a/gas/dwarf2dbg.c +++ b/gas/dwarf2dbg.c @@ -2271,11 +2271,15 @@ out_dir_and_file_list (segT line_seg, in if (files[i].filename == NULL) { - /* Prevent a crash later, particularly for file 1. DWARF5 - uses slot zero, but that is only set explicitly using a - .file 0 directive. If that isn't used, but file 1 is, - then use that as main file name. */ - if (DWARF2_LINE_VERSION >= 5 && i == 0 && files_in_use >= 1 && files[0].filename == NULL) + if (DWARF2_LINE_VERSION < 5 || i != 0) + { + as_bad (_("unassigned file number %ld"), (long) i); + continue; + } + /* DWARF5 uses slot zero, but that is only set explicitly using + a .file 0 directive. If that isn't used, but file 1 is, then + use that as main file name. */ + if (files_in_use > 1 && files[1].filename != NULL) { files[0].filename = files[1].filename; files[0].dir = files[1].dir; @@ -2284,12 +2288,7 @@ out_dir_and_file_list (segT line_seg, in files[0].md5[j] = files[1].md5[j]; } else - files[i].filename = ""; - if (DWARF2_LINE_VERSION < 5 || i != 0) - { - as_bad (_("unassigned file number %ld"), (long) i); - continue; - } + files[0].filename = ""; } fullfilename = DWARF2_FILE_NAME (files[i].filename,