From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id GX2ZF3RlqGmERxQAWB0awg (envelope-from ) for ; Wed, 04 Mar 2026 12:01:40 -0500 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=labware.com header.i=@labware.com header.a=rsa-sha256 header.s=mimecast20220511 header.b=byQSu3cS; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 5624A1E0E1; Wed, 04 Mar 2026 12:01:40 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,RCVD_IN_VALIDITY_CERTIFIED_BLOCKED, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 24B8F1E089 for ; Wed, 04 Mar 2026 12:01:39 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 8ABCD4BA23E6 for ; Wed, 4 Mar 2026 17:01:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8ABCD4BA23E6 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=labware.com header.i=@labware.com header.a=rsa-sha256 header.s=mimecast20220511 header.b=byQSu3cS Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.133.114]) by sourceware.org (Postfix) with ESMTP id D24454BA23D6 for ; Wed, 4 Mar 2026 17:00:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D24454BA23D6 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=labware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=labware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D24454BA23D6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.114 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772643601; cv=none; b=gGy2MVLCz39siZj/+D7M98/Q1AZAI47J+cwXZXiOkFehXxnQl213vpVGni4plaATYNWlWUPhv70vjO1wLtI90MZwYM4yhTf0cj1T5hMo1wf1hA6PZeaoFQkuEbiSJxqI7C1rSn6GGkHGI6z8lCQzkSB5mii6bizZeZ9NWslrarg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772643601; c=relaxed/simple; bh=jClGbcQ+poHbQBjpjgBbCrvFfyny3Zbwd55k+Tn3jtY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=N9b6dnjX0KU9rriwSqulYthsU1190t51JQiS6RNBlCqe8flkGVASFvx2EibpbIp1OrCD/7MVMjrNjntLUGdfS4nBqygRSxFO6uU2L2vLxT7o6gBT3QPq5pW8QR9dD9SpbFCX0fwmuGMKkwlemPGfmW8zmQ8wJA2p/DbG22aNxA0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D24454BA23D6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=labware.com; s=mimecast20220511; t=1772643600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hvQp2VLSg7VAZ0hrcpIbh+WU2pyLDWTWezv/BevHmF4=; b=byQSu3cS7Nj8u82xF/dkmvT5p1M8kVK0RK8dNLczJkpCXgaVvXZJCGUQnzXAgfuW9HLr3e YYGiSFo5upYpXR/gmkyX1LQzjGg+Qz0f8W4g4/MtOZ/jc3F0vIJ6x3+fO673QBjlEncWfr xpw7/TjfHR0DGln6m05prZ1guiQjXIg= Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11021133.outbound.protection.outlook.com [40.107.208.133]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-492-TjjeRCFlOpSIS9jev7XQNA-1; Wed, 04 Mar 2026 11:59:59 -0500 X-MC-Unique: TjjeRCFlOpSIS9jev7XQNA-1 X-Mimecast-MFC-AGG-ID: TjjeRCFlOpSIS9jev7XQNA_1772643598 Received: from SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) by PH0PR17MB4813.namprd17.prod.outlook.com (2603:10b6:510:89::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9654.22; Wed, 4 Mar 2026 16:59:57 +0000 Received: from SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::9a:538a:fa42:730e]) by SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::9a:538a:fa42:730e%3]) with mapi id 15.20.9654.022; Wed, 4 Mar 2026 16:59:57 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany Subject: [PATCH v2 1/7] gdb: implement readnow_functions::find_pc_sect_compunit_symtab Date: Wed, 4 Mar 2026 16:59:08 +0000 Message-ID: <20260304165914.3209106-2-jan.vrany@labware.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260304165914.3209106-1-jan.vrany@labware.com> References: <20260304165914.3209106-1-jan.vrany@labware.com> X-ClientProxiedBy: LO2P265CA0311.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a5::35) To SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA1PR17MB5365:EE_|PH0PR17MB4813:EE_ X-MS-Office365-Filtering-Correlation-Id: 57858026-e24f-433f-6db9-08de7a0f7705 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024 X-Microsoft-Antispam-Message-Info: dKWod/XibttT0RB52v24boIVCAIwuuJUvRZb+pQEB90iumzIqHf1/nm86eb3aRMkLFT2e+CEJWDyWYgsbqXhZpr+8dWPc7qAi+B7pBgMvmBFpqVGG+5QEVkhHENxm8lU46H6uQUX2TMNseXeKaHOOYeMwUcCsvT9tGigr+5tPS/hLItMpEnOwm53weNPA/EgOxwlUl/h8OkXVKQuazF7oeolpY4pCGoh3uMeEgaH5pb9jjJxvu91TTN4gPuiDaKzc9++91tIKJieW+fl/vLXawYeJKWyAnBPtMRwxa4MMHIMd6nImSSKCbEaZDc5S4WbugiW9FfaSq62IHy+rbXo7h0Dz06PwJcDuUhxitbNJIJIqZKTLZCypYXs8PSyt7ec5181PuEjA432J4F3/yS3nIyKof8OmGFUr2nlgbAbwNLHYODCvKRltDLBrlU7VgVP/WbgZgUKc0AKOQjBlvxYCVXdUsM50klArmoyWKV+NmtDzeFLzMxS9tNd33fbfqufA7YtGzoImYX1FVyA2dhTxc8rzCEeNKOnYWmF8YnZd/2iZoTihwJ2PoEDWMkQPEgnKXpZouQYCnL32aOGzxWPP1CfdaIuY8oO/UWVzIEmdwvRULUREEcWl21iGKyZwwGEuW0mF6Qri+qkGwz/f0F2gbhgBvafO2PUCxYY1IbaRp7jTsoIPsMMZaWUhYVxj3u5ZK40qnY8cpCWt9OEILT4NYsiE2QBYg5y5MpKdcBzUDA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA1PR17MB5365.namprd17.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1ECxsrY9k73IYiniG7JfhlEEpbfqptlCjncCcReJ0uha/wymwxSYOu03P0+7?= =?us-ascii?Q?lfBSp99gOUI6DzfnHgLzzsuCuXUIi9n/ncJ6KvZqxkEXiSP+9gPZECSK/ck4?= =?us-ascii?Q?ZGivUXsTj1oJrqipNHJ4s04g/yCjntHqZf3MlpWmwXvNq2sXFdol20tKv5+z?= =?us-ascii?Q?tuwN7bXU6pDKPMinhk/UqLIOH+YRFvQk5YQgLzxWZ5S3ztglmk5MpKYwP4Zq?= =?us-ascii?Q?A6KCjpyHQFD/tzmyji/f1+R1WzQvdtsc+D7NWOagZlsskV4Zfur3W0JLO31D?= =?us-ascii?Q?5/0kAk9aNbn/tBbtN4Js0YkpWHf9mMoSXM9Om5RBnwfxV3KYjRUWDOpRP9K2?= =?us-ascii?Q?DmJ/d8FleY80GsgewZ52cpp4mhjVvirNVQP804tRkvyA/AUwigwV3e5RZJZ1?= =?us-ascii?Q?ORfTM/CeA+mRldcE6VHPLL6BQJix5XQmY4tRpDUEEQScP8WEdEygZ6OzLONg?= =?us-ascii?Q?NY6M47s4xtG7yiYXHAaEY6KKmpA426vjFJZCfq7G7ClQvkha8HN6gZTUNhRI?= =?us-ascii?Q?8L/1dYBJ3xfKN6nNtPrzEzKO8dy7GuARYLpz3G953EPmupqdbQlQ3s+aFTyA?= =?us-ascii?Q?LEFMTCepUlqq8L+5dd2TuVGuxSUZZAy8rKNglQnOXrRJ1fsU6OBtRKsgdXwL?= =?us-ascii?Q?OuSk+LoP0tLAg6ECrXMn9QNqbXJg+AWwRtJ5yCEcHHM5aY+mX7BEgbdLNLaE?= =?us-ascii?Q?fFiJRCcY2sUJiYbmXLH8f0+NJQV7G8vppeUcrCHxs6ZUM5q34gZFdVLfmmH6?= =?us-ascii?Q?uriCOoIStasUXV3InZvSZcXgmF/wmkybZ0y+q5xSn81veV1v6eSTer2Il3zr?= =?us-ascii?Q?VTla65N7EOomJXbm2dqKCHzub8kW5wkqWj0e228beRVTVlAoGCMQe+uP7wBy?= =?us-ascii?Q?0afNaBPuVk9+yY+x9z+BMTLgQdYd2hhexNhz46W6rXnxBUyTXB/p5lOJM/v1?= =?us-ascii?Q?UFa2nfli5YNe9FmlImGBTa/mMG1KxEnayT+hhmKI9Yppxm6D5cTrHGVyy1iV?= =?us-ascii?Q?BV3izhp7lx7sn0tn3INgTINz0AR4mlMc0lWUY/bvNnvME47XBQiz7Wh3csnO?= =?us-ascii?Q?d2KVd3CDyROt6pysh51hi7Gw4vOkEslkDQoOFK8Ov28S+3DCsE1HDwf+RSY9?= =?us-ascii?Q?RmdaCEpVgnY/NhOO2tn7HGuCW0FQx1+WaGYLTTdEpS5Yo9VhKsAMZ5wPoTjH?= =?us-ascii?Q?8okxbo3ckRYbeC+jA0QANnbI0STOloD8JlVELi0de1BX71XeicUbe+n7ZwIp?= =?us-ascii?Q?ozmCv6r1wHzEh/snaS6QQgRHzSeoCerSwyEjO6wbQ+tnnM3JZdn2yKwBVbW5?= =?us-ascii?Q?x2LpkYtK9Hc4RmgL7xCWbGPPK2QyMYD+YfL+ECExol5U2jQq+OG/YQ2W56gj?= =?us-ascii?Q?Jcuc6rx1walbwrNRw68o96dslyS7CEYejS25OakgRtzBEl3zTyfzDfK28CCG?= =?us-ascii?Q?hKQIfsVTAo0SiJb8707q7XMqJyhovkg+6dY5B7B5GY1rUKE0WmiuGSwupgXa?= =?us-ascii?Q?mhGnbgRsRTdD4cVUpc3TN3ywcQ+KY1iukqwyN63ggz0KJnVN7+JkHTQfYq+P?= =?us-ascii?Q?c7XB8sSMUg5yWBA1BVhQwzTzxXBHDfj7X9u9VGz3nTQtfJvVJeTmyBwtliKk?= =?us-ascii?Q?W9XZbGT1gcDZMDpF8CRydUbrCfOF37PB9TXeOMrSuaOTa3bM9byKIEyXmvVR?= =?us-ascii?Q?nbbTkxLAIxRIGC7g0f37G/eMMgN8HSLxkJSGcV8Vq+QwDdAoOcSQt/eMXIra?= =?us-ascii?Q?eg3xvh93gg=3D=3D?= X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57858026-e24f-433f-6db9-08de7a0f7705 X-MS-Exchange-CrossTenant-AuthSource: SA1PR17MB5365.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2026 16:59:57.5244 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b5db0322-1aa0-4c0a-859c-ad0f96966f4c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: n0OcvOJKhYYMz8Wy7wvhiP3l0zsWpClk1cjvK8r4ZDsrKUGEaUZ9PLefGohFILI+jdtYfu2hklDfp5J1EfAhKA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR17MB4813 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: HPizx9yhIN9IBUuvFW1ffUSAWSTnk9SZnG3vsl0YMow_1772643598 X-Mimecast-Originator: labware.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=WINDOWS-1252 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org This commit implements readnow_functions::find_pc_sect_compunit_symtab. As comment in read.h states, index_table member dwarf2_per_bfd is null when -readnow is used and thus this method would always return null when using -readnow. This issue did not manifest until now because: 1) readnow_functions::find_pc_sect_compunit_symtab is called from find_compunit_symtab_for_pc_sect *after* all CUs expanded so far are searched and, 2) it happens that required CUs were expanded by other "quick function" called prior find_pc_sect_compunit_symtab. This is a preparation for simplifying find_compunit_symtab_for_pc_sect by removing the code that walks all existing CUs. In order to handle interleaved CUs with "holes" this implementation walks over all CUs and looks for a CU that contains the "closest" (smallest) block that contain given PC. An example of such a case is test dw2-entry-points.exp. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D33829 --- gdb/dwarf2/read.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index a6244319f71..f7f39d75c16 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1525,6 +1525,10 @@ struct readnow_functions : public dwarf2_base_index_= functions return true; } =20 + struct compunit_symtab *find_pc_sect_compunit_symtab ( + struct objfile *objfile, bound_minimal_symbol msymbol, CORE_ADDR pc, + struct obj_section *section, int warn_if_readin) override; + struct symbol *find_symbol_by_address (struct objfile *objfile, =09=09=09=09=09 CORE_ADDR address) override { @@ -2166,6 +2170,57 @@ dwarf2_base_index_functions::find_pc_sect_compunit_s= ymtab return result; } =20 +struct compunit_symtab * +readnow_functions::find_pc_sect_compunit_symtab + (struct objfile *objfile, + bound_minimal_symbol msymbol, + CORE_ADDR pc, + struct obj_section *section, + int warn_if_readin) +{ + dwarf2_per_objfile *per_objfile =3D get_dwarf2_per_objfile (objfile); + dwarf2_per_bfd *per_bfd =3D per_objfile->per_bfd; + + /* This invariant is documented in read.h */ + gdb_assert (per_bfd->index_table =3D=3D nullptr); + + /* Since we have no index, we have to walk all CUs and find one with the + "closest" block that contains PC. For the purpose of this method, + a block B1 is considerent closer matching than block B2 if B1 is not = null + and B2 is either null or has larger total span than B1. In other wor= ds, + smaller blocks are "closer". */ + + auto closer =3D [&] (const block *b1, const block *b2) + { + if (b1 =3D=3D nullptr) +=09return false; + if (b2 =3D=3D nullptr) +=09return true; + return (b1->end () - b1->start ()) < (b2->end () - b2->start ()); + }; + + compunit_symtab *best_cu =3D nullptr; + const block *best_bl =3D nullptr; + + for (int i =3D 0; i < per_bfd->all_units.size (); i++) + { + dwarf2_per_cu *data =3D per_bfd->all_units[i].get (); + + if (per_objfile->symtab_set_p (data)) +=09{ +=09 compunit_symtab *this_cu =3D per_objfile->get_symtab (data); +=09 const block *this_bl =3D this_cu->blockvector ()->lookup (pc); + +=09 if (closer (this_bl, best_bl)) +=09 { +=09 best_cu =3D this_cu; +=09 best_bl =3D this_bl; +=09 } +=09} + } + return best_cu; +} + void dwarf2_base_index_functions::map_symbol_filenames (objfile *objfile, =09=09=09=09=09=09 symbol_filename_listener fun, --=20 2.51.0