From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sZo0Olhel2lDvwEAWB0awg (envelope-from ) for ; Thu, 19 Feb 2026 14:02:48 -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=gdWHYT5r; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id E6FD81E08D; Thu, 19 Feb 2026 14:02:48 -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 B067E1E08D for ; Thu, 19 Feb 2026 14:02:47 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 627B54B9DB6D for ; Thu, 19 Feb 2026 19:02:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 627B54B9DB6D 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=gdWHYT5r Received: from us-smtp-delivery-114.mimecast.com (us-smtp-delivery-114.mimecast.com [170.10.129.114]) by sourceware.org (Postfix) with ESMTP id F38574BA23E0 for ; Thu, 19 Feb 2026 18:58:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F38574BA23E0 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 F38574BA23E0 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.114 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771527503; cv=none; b=pWL3/gnyA9GEtckeKr4USMFUc12BkaMka0FVJC2drTgSUwjMJ7bx1jsZiu3Pwyizk7U6elby+xOHTKzM/7Ch/R5OLqWXcQVFn2vgeAvb0u38JgUWukT3TyduHjUpbePqFZJS6OtaPv7JbTayiMRvASB/Mj7euoMIWasJSMTGbbk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771527503; c=relaxed/simple; bh=nHzzp+XtIkCjHWT6jPNOWz06F/9xJcmEm+ehvACQyaY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=xzVdLOsow50Tc4uJcPRwPdCv6o8I123XOBeZCLnOQDpkGUtSZMQ83jz9v4OFJZNmrlH36n1rwx4I7yVvzM0ALmtoGJ/p1WU1MO8I82CeERCZeYV8GcB89cqpGfWGwW06XAzMW8M3WR52CQKA9ysuYV0ZU8s0xjsK6paETMSilp0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F38574BA23E0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=labware.com; s=mimecast20220511; t=1771527497; 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=2+ZfrLhHVrvm2SAAMBeVJjfRQ/Ox8ixHGj6j6MeZuaQ=; b=gdWHYT5rc9zv0oYjY8Z1pQijCaw5YvF7vxFOYK8EiNuOHRIwgyzk8hBkfEUFWCubb9CbAV jh0Zt8btNxGrBTiIYe1okem/QEqj3k/dVlfyr9c9SU0rPqR7eAEJRQJdpaThaSvRtcSpJq /y7tE2zjUpHgBYqSOjYFuIyin+JCLmM= Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11022090.outbound.protection.outlook.com [52.101.43.90]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-OuXiIeOiPiSIB1NmaX5NAw-1; Thu, 19 Feb 2026 13:58:16 -0500 X-MC-Unique: OuXiIeOiPiSIB1NmaX5NAw-1 X-Mimecast-MFC-AGG-ID: OuXiIeOiPiSIB1NmaX5NAw_1771527495 Received: from SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) by CH3PR17MB7196.namprd17.prod.outlook.com (2603:10b6:610:198::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.16; Thu, 19 Feb 2026 18:58:14 +0000 Received: from SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::9a:538a:fa42:730e]) by SA1PR17MB5365.namprd17.prod.outlook.com ([fe80::9a:538a:fa42:730e%7]) with mapi id 15.20.9632.010; Thu, 19 Feb 2026 18:58:14 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany Subject: [PATCH 6/7] gdb: remove address map from struct blockvector Date: Thu, 19 Feb 2026 18:56:37 +0000 Message-ID: <20260219185638.360694-7-jan.vrany@labware.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260219185638.360694-1-jan.vrany@labware.com> References: <20260219185638.360694-1-jan.vrany@labware.com> X-ClientProxiedBy: LO3P265CA0011.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:bb::16) To SA1PR17MB5365.namprd17.prod.outlook.com (2603:10b6:806:1d8::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA1PR17MB5365:EE_|CH3PR17MB7196:EE_ X-MS-Office365-Filtering-Correlation-Id: a75a9d34-5573-4afa-dcfd-08de6fe8d59f 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: =?us-ascii?Q?wI322a5XnkZncHbi7U1XaDZjCH6qXenmb70dEALv9fhzQAeSGWIA085Hu8x6?= =?us-ascii?Q?cl+8RlPxcJ9gC9hYi55PrX6ZevYWBxM4Gmr/Kl2Ak5td0vo+dD3bmyRin4Dy?= =?us-ascii?Q?jb8bKQwjuGo+FPUI2Fhggje5JtjSOZEqWXJbyroB7IoBHKYlGaSHYU7IccMC?= =?us-ascii?Q?LnMrBJlIv06dPdbad4TFr+UYCcLQaOkQP58POZTWr+rNTC/c+5kGa2FlJvW+?= =?us-ascii?Q?GnQl4Dm8tAT3F9dDjy9OMMDJaqK8M4Z7a9n8lEif0LzYLU0MiumBnlUvYYbn?= =?us-ascii?Q?+r+YCGdQMWSrqEK24Y2RZ7tJK/n8nZM729TbRUeOlHtT9xuM4hg6aJg5MpYw?= =?us-ascii?Q?1ffzk8E/EJI1v2BIkqzPaKplDoMfDQLma9k3JJPGA+1Ebvk3fXN7SBH5HHDV?= =?us-ascii?Q?Xsd5jfvXjd0muLNtOi7abKjKG3fXqoQCcYEsivzSNc6TFOmhPwUYVLki5ga8?= =?us-ascii?Q?L30+Ar2qQItAiL/0DjycT4cZ2IX2VBN2PKJwpDl4gSvzqMC1bNH/a+8S1VM2?= =?us-ascii?Q?+/XixGlaK5mDX+3aUcBno9nHz8rrOLBohutoIEGKW7GBoDggliGW3H5wdyTr?= =?us-ascii?Q?Jyj+PNip9eELUWz/0/s31YRn+SDambz3ZLsS0C8U2tNbIcK/xEovq1fFB9N0?= =?us-ascii?Q?sNlYD9jmF/8U1tV+hJ3XVgZtxn5UIcUdk8iomfMRb/m0zUOzqK2Gg025+ALx?= =?us-ascii?Q?zkxZSk2VP2OfJPij59KwWag4E2uOB6BDMuDw9OlhwjFPfskSxHaFbNWJjmZO?= =?us-ascii?Q?t+lAgfEMeYK2A78ciAFh9KElAPICql5NUAjSalwaDtYnEYpGLTHqkk6sI93R?= =?us-ascii?Q?E6Q640naN1FypfhW5a8YCkHpmPBBkdqIUx6RgydJqO+3yifeoFKG+vzYmW+T?= =?us-ascii?Q?n/T6orSAsBst+VFNKAMsYzvEW7UvhVqnPedrenVpzbSNxjaVN6k7BJH5ms0K?= =?us-ascii?Q?8sFSV9EbtEeujKNewebG79gwityTqRfYTtWBc9It+frYdlooQi3qVX+BBohd?= =?us-ascii?Q?PwZqzM2qpYmWDeKOLTnNb1pHXV8559WiPCPtlKlZuy/kqyG00vJmBi9/M+SK?= =?us-ascii?Q?+TI946rFFveZspquHMJRXYxN4v+vkqUcUnK14YmuoER0nddsOnmdbIV3KOSA?= =?us-ascii?Q?dX0uQBDnp5tUbwG+DLqMoJg2EbBLE8yRkdzfC/xcc2441jCNu1ekwqi+MU3r?= =?us-ascii?Q?2ut6ELBQUfWP9tWhnE+FQNkD9OXE0mHY31qWBhxtzdkcmWlxDemB2rXMUbLP?= =?us-ascii?Q?iv/nkCwcRdx6KQtDYVnujwoEOksVc4CP3zJ+O2Y3pOuh1qhfIZ/HpPjjEJj0?= =?us-ascii?Q?23rFH60cBa3Stkgt67nOXeHHpG+om5uenk+AYzTKTGtcnux1M7/rSwjHXzgh?= =?us-ascii?Q?TuZp/uPvcyQxUiw5S6NauQopPRN5ywW5ormH8T4x1gCN2mcqzVeayzlL3wdM?= =?us-ascii?Q?zEl+w+sM4r74vm8UY0kZh6KAHSggUutVv8fXs97/irPm5NREL03C2od4gBlR?= =?us-ascii?Q?saHgTCPKW0L+Mbf+zuHco3EZ2bT5+CG8U6JV17r0ExwGiXKJxN7r5ohhGez0?= =?us-ascii?Q?E6LgAaX+Q/d/S/z7hiI=3D?= 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?Eh4uNjKucHXz/wLRb0kZN+mieKYo0WEp/wOlsyQ4KT1ghUB2fzxBPW3aqFdw?= =?us-ascii?Q?zfb4sFzh37HbGnBB/92r0E3aCptpSvo3mnoj3dlbqHYO0qs96kCQQ4Y63DF7?= =?us-ascii?Q?UlIDcnhVVBLvrKtLfoe1S7FzMgV8RN53K6/ksF0lLw+B5JLOEw8a+Gn97dUQ?= =?us-ascii?Q?vw1EyVIvzC8e4vZHk1SRl9u9Q8LMcU488QOgbLN9l+t1tGr+raro5kgjmmBz?= =?us-ascii?Q?JDgMSxhJtyj5tQet2lSBLGbYcj07R8WxH9YU2Ar2BWZcSTW67vY5GJhVobw8?= =?us-ascii?Q?WbfZc7uzwH5gOADb81OIz92u7SzWDP30nusyWHBHu826c1arPmVZUp3Q2UiM?= =?us-ascii?Q?Prm3rXGvMLl2T30CmYkPJrr+iVq7TLBifiRdf6GTvqNjhIswhQb4C6HjcGFH?= =?us-ascii?Q?/7Ol6OXWg2cwADh9Rq6Bt+TBvZ/kDm9DYsNLFfbUFNAFqB6HDOY3Wq0fvFYV?= =?us-ascii?Q?XsmnWFM0Haeg/m3Nm9738HVC/sT/yboWJ8EL1rGZiECARX0Reha4JHwoQOhh?= =?us-ascii?Q?vqfCi8S/F26puE9gQB35HsO6n43A80RclNCv12PRQ19ipD9cX6pU8gxIzpcz?= =?us-ascii?Q?fNaqSbt3ZeJyySBLFK32npzyJb/qMUqin2kBp6KTHU/u1xvQUHS3mtET3Qm/?= =?us-ascii?Q?3BvzLf51V/RfUrquBbafeqXzdtCb24Lwzm322AyvyxBVCOzbnGXd3OySlVJo?= =?us-ascii?Q?yMFse/X6v+4omY/FiAvnXUJ3502X9P6qJPJNk/DqWxfglWsyaH3So+e6gVJy?= =?us-ascii?Q?8DGY6Ypb/5lRsoQyYqInnV1xB/q1uKWOPeyoZoVf7Z09R69HTubz+PJMKNcT?= =?us-ascii?Q?eDA7Sx6e4mWuNWy+HFNMAUV2ych225ny9E77csZGwtzOXWNRrhqvhLl6YWEq?= =?us-ascii?Q?kAR5DpXqo64zlhTtl8tpXut1/ICBpVuetv8DW3utwpSKjFmOKDYEopAoy/NJ?= =?us-ascii?Q?Fg4t2YlnU/BFu2BLHBr/xovK5b1twR+eVR7qoY0XFgJsv/hlZtuPkBq3J8mw?= =?us-ascii?Q?rz4qKv1h0ZvRorji5xHRG73bySCelBjsirbNBX5jPOqiydKkVmvYJXmQJwbe?= =?us-ascii?Q?2ByIy4GgDEAA8TD+1+5vEawS74QlsDG6jV68DZUKokTwvjuWovEn/DMG1/zw?= =?us-ascii?Q?lqc6VSNgBypybBY0GpSycrru6QQpPpGZQoHBCSNuSaZ3exMoOazdLe3q2wVy?= =?us-ascii?Q?ygUlmLmT32TdR7shQ0hNhipMwlpsM8T7bmbdhPQkddAkQTWZsVi8VYBprpVC?= =?us-ascii?Q?IeIq+EwBZn4MFEyMe+UvF9xlRJDswKPnkcfjZQavs3CL0kbZ7wadevVUqMOe?= =?us-ascii?Q?B5d3ixIlm52AUqnq9njHuQ23tsiAnAucZfA1qbtkqt7BSenLtEXSBPuvjKds?= =?us-ascii?Q?yNpQW9m5jhOo069E6lp59yvC+2EzIJmrSBUTB6ZaPGmVDR5wKzt2zqUGv6dd?= =?us-ascii?Q?zLBUBCMC+Bfxm88XrofDvfph5MLGJGM/lMKyk09lyWEDaUli4pa1X7GI9Bcs?= =?us-ascii?Q?TJ1019INnL78gKFwhiObjys2jGwBtfXYPT10QeqKNiAXYaUwOoEedLON0BGr?= =?us-ascii?Q?e6oHYdMRedF/U56tnIbc6aLcXDHLiMIGsefOcwLKk6Gbl8fPrFquETggd7qf?= =?us-ascii?Q?tY8P6xsHQzoGqOUjFCOq5EEQ9Fg3yG1O/goYqBYdlIvnN1T616pHLdEfXLCm?= =?us-ascii?Q?BnZcDDe2JnG9UA4CbT9Ut59jZgPWRg9XJEjsFWv4NyfiBK6X71a3t03Ia7Ff?= =?us-ascii?Q?Ibo0qFhQ8g=3D=3D?= X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: a75a9d34-5573-4afa-dcfd-08de6fe8d59f X-MS-Exchange-CrossTenant-AuthSource: SA1PR17MB5365.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2026 18:58:14.1307 (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: Dme2rvtqROX37pwaIZ4j6XlsX+9Lf6Gkn1mpA7MfTUHgwCB2abmlniY9bEeJuEkJ4967316t1Dq42agY0sluHw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR17MB7196 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: j_h7fWn18JKBdsW4zJLhuMfnu1z0Pp2FTl2wl_002w0_1771527495 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 removes m_map member and its accessors from struct blockvector since it is no longer used. It also updates unit test accordingly. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=3D33829 --- gdb/block-selftests.c | 90 ++++++++++++------------------------------- gdb/block.c | 10 ----- gdb/block.h | 13 ------- 3 files changed, 24 insertions(+), 89 deletions(-) diff --git a/gdb/block-selftests.c b/gdb/block-selftests.c index d23783d6bdc..77b8d67ded8 100644 --- a/gdb/block-selftests.c +++ b/gdb/block-selftests.c @@ -40,35 +40,19 @@ make_block (struct blockvector &bv, struct obstack &ob,= CORE_ADDR start, return b; } =20 -/* A helper to create and set address map given a blockvector. */ static void -make_map (struct blockvector &bv, struct obstack &ob) +test_blockvector_lookup_contains () { - struct addrmap_mutable map; - - for (int i =3D bv.num_blocks () - 1; i > STATIC_BLOCK; i--) - { - auto b =3D bv.block (i); - map.set_empty (b->start (), b->end () - 1, b); - } - - bv.set_map (new (&ob) addrmap_fixed (&ob, &map)); -} - -/* Create and return blockvector with following blocks: + /* Create blockvector with following blocks: =20 =09B0 0x1000 - 0x4000 (global block) =09B1 0x1000 - 0x4000 (static block) -=09 B2 0x1000 - 0x2000 +=09 B2 0x1000 - 0x2000 =09=09=09=09(hole) -=09 B3 0x3000 - 0x4000 - - If USE_MAP is true, then also set blockvector's address map. -*/ -static blockvector_up -make_blockvector (struct obstack &ob, bool use_map) -{ - auto bv =3D std::make_unique (0); +=09 B3 0x3000 - 0x4000 + */ + auto_obstack ob; + blockvector_up bv =3D std::make_unique (0); =20 auto global_block =3D make_block (*bv.get (), ob, 0x1000, 0x4000); auto static_block =3D make_block (*bv.get (), ob, 0x1000, 0x4000, @@ -76,51 +60,25 @@ make_blockvector (struct obstack &ob, bool use_map) make_block (*bv.get (), ob, 0x1000, 0x2000, static_block); make_block (*bv.get (), ob, 0x3000, 0x4000, static_block); =20 - if (use_map) - make_map (*bv.get (), ob); + /* Test address outside global block's range. */ + SELF_CHECK (bv->lookup (0x0500) =3D=3D nullptr); + SELF_CHECK (bv->contains (0x0500) =3D=3D false); =20 - return bv; -} + /* Test address falling into a block. */ + SELF_CHECK (bv->lookup (0x1500) =3D=3D bv->block (2)); + SELF_CHECK (bv->contains (0x1500) =3D=3D true); =20 -static void -test_blockvector_lookup_contains () -{ - for (bool with_map : { false, true }) - { - /* Test blockvector without an address map. */ - auto_obstack ob; - blockvector_up bv =3D make_blockvector (ob, with_map); - - /* Test address outside global block's range. */ - SELF_CHECK (bv->lookup (0x0500) =3D=3D nullptr); - SELF_CHECK (bv->contains (0x0500) =3D=3D false); - - /* Test address falling into a block. */ - SELF_CHECK (bv->lookup (0x1500) =3D=3D bv->block (2)); - SELF_CHECK (bv->contains (0x1500) =3D=3D true); - - /* Test address falling into a "hole". If BV has an address map, -=09 lookup () returns nullptr and contains (). returns false. If not, -=09 lookup () return static block and contains() returns true. */ - if (with_map) -=09{ -=09 SELF_CHECK (bv->lookup (0x2500) =3D=3D nullptr); -=09 SELF_CHECK (bv->contains (0x2500) =3D=3D false); -=09} - else -=09{ -=09 SELF_CHECK (bv->lookup (0x2500) =3D=3D bv->block (STATIC_BLOCK)); -=09 SELF_CHECK (bv->contains (0x2500) =3D=3D true); -=09} - - /* Test address falling into a block above the "hole". */ - SELF_CHECK (bv->lookup (0x3500) =3D=3D bv->block (3)); - SELF_CHECK (bv->contains (0x3500) =3D=3D true); - - /* Test address outside global block's range. */ - SELF_CHECK (bv->lookup (0x4000) =3D=3D nullptr); - SELF_CHECK (bv->contains (0x4000) =3D=3D false); - } + /* Test address falling into a "hole". */ + SELF_CHECK (bv->lookup (0x2500) =3D=3D bv->block (STATIC_BLOCK)); + SELF_CHECK (bv->contains (0x2500) =3D=3D true); + + /* Test address falling into a block above the "hole". */ + SELF_CHECK (bv->lookup (0x3500) =3D=3D bv->block (3)); + SELF_CHECK (bv->contains (0x3500) =3D=3D true); + + /* Test address outside global block's range. */ + SELF_CHECK (bv->lookup (0x4000) =3D=3D nullptr); + SELF_CHECK (bv->contains (0x4000) =3D=3D false); } =20 } /* namespace selftests */ diff --git a/gdb/block.c b/gdb/block.c index b964674865b..cd0f60ef3cb 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -842,11 +842,6 @@ blockvector::lookup (CORE_ADDR addr) const if (addr < start || end <=3D addr) return nullptr; =20 - /* If we have an addrmap mapping code addresses to blocks, then use - that. */ - if (map () !=3D nullptr) - return (const struct block *) map ()->find (addr); - /* Otherwise, use binary search to find the last block that starts before PC. Note: GLOBAL_BLOCK is block 0, STATIC_BLOCK is block 1. @@ -925,11 +920,6 @@ void blockvector::relocate (struct objfile *objfile, =09=09 gdb::array_view offsets) { - int block_line_section =3D SECT_OFF_TEXT (objfile); - - if (m_map !=3D nullptr) - m_map->relocate (offsets[block_line_section]); - for (struct block *b : m_blocks) b->relocate (objfile, offsets); } diff --git a/gdb/block.h b/gdb/block.h index f65546792ca..9134cd43d0f 100644 --- a/gdb/block.h +++ b/gdb/block.h @@ -492,14 +492,6 @@ struct blockvector const struct block *static_block () const { return this->block (STATIC_BLOCK); } =20 - /* Const version of the above. */ - const addrmap_fixed *map () const - { return m_map; } - - /* Set this blockvector's address -> block map. */ - void set_map (addrmap_fixed *map) - { m_map =3D map; } - /* Block comparison function. Returns true if B1 must be ordered before B2 in a blockvector, false otherwise. */ static bool block_less_than (const struct block *b1, const struct block = *b2); @@ -526,11 +518,6 @@ struct blockvector =09=09 gdb::array_view offsets); =20 private: - /* An address map mapping addresses to blocks in this blockvector. - This pointer is zero if the blocks' start and end addresses are - enough. */ - addrmap_fixed *m_map =3D nullptr; - /* The blocks themselves. */ std::vector m_blocks; }; --=20 2.51.0