From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 8MyOJ7dkl2daIRwAWB0awg (envelope-from ) for ; Mon, 27 Jan 2025 05:49:27 -0500 Received: by simark.ca (Postfix, from userid 112) id 9D24A1E105; Mon, 27 Jan 2025 05:49:27 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.0 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (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 3A6371E08E for ; Mon, 27 Jan 2025 05:49:27 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E23543858289 for ; Mon, 27 Jan 2025 10:49:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E23543858289 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 5FAB53858435 for ; Mon, 27 Jan 2025 10:45:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5FAB53858435 Authentication-Results: sourceware.org; dmarc=pass (p=none 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 5FAB53858435 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=1737974739; cv=none; b=Nk727wRHyTVZM1lX31421Z/9mMCS6cpFO8+IWdkIM3rHG5AI3RhVaXhBufgk8eHtRIQDZ2cRo9Hx/TNNpOIFCc23qoVF3bY8MbF8zsM6Zz1JN54t2X3D6j3kABJvsw9FF3Jrs5tb99yEEmW9zHvnTZBJhKUTcFSUJ8DbHi02qJc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1737974739; c=relaxed/simple; bh=rGSifNoLqsrel8WBAIRwEHDHvgOuKL5ByCs7B7mrMtU=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=V5oDuBBo6aHOE1smrmoHrxnECfhdPCQZi95gEz1igBxloUS4dGsrKhIvx4m5T524r5NjJjES+ezt3nqpHilR76GWErQO8QbTJ/fzv/b9xk2ndBvHT2vj42T8Q64jZ3c91K5JBclfjmCO651MnhfmlmamqbQXH3ebcqCh7ROiTuo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FAB53858435 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12lp2040.outbound.protection.outlook.com [104.47.66.40]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-576-pXU-H6RbO2-vm0I79ikdzQ-1; Mon, 27 Jan 2025 05:45:37 -0500 X-MC-Unique: pXU-H6RbO2-vm0I79ikdzQ-1 X-Mimecast-MFC-AGG-ID: pXU-H6RbO2-vm0I79ikdzQ Received: from SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) by DM4PR17MB6954.namprd17.prod.outlook.com (2603:10b6:8:18e::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8377.22; Mon, 27 Jan 2025 10:45:35 +0000 Received: from SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::38a7:a6f2:3b95:bc26]) by SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::38a7:a6f2:3b95:bc26%5]) with mapi id 15.20.8377.021; Mon, 27 Jan 2025 10:45:35 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany Subject: [RFC 1/9] gdb/python: preserve identity for gdb.Symtab objects Date: Mon, 27 Jan 2025 10:44:27 +0000 Message-ID: <20250127104435.823519-2-jan.vrany@labware.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250127104435.823519-1-jan.vrany@labware.com> References: <20250127104435.823519-1-jan.vrany@labware.com> X-ClientProxiedBy: LO4P123CA0596.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:295::10) To SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR17MB4314:EE_|DM4PR17MB6954:EE_ X-MS-Office365-Filtering-Correlation-Id: adb362da-1ece-47c5-73b9-08dd3ebfbae6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024 X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?HhwpN9kNiAUC6iDX/Z5iMJOUugI7jsRgf6VyIxkUVV3/5tC79ufBoMRMuEUT?= =?us-ascii?Q?1MKsOSijn50UASPCnnS3w65dQ7WdFSXjuHmJi0zaW2fJibMUwpzNfrWVxnRG?= =?us-ascii?Q?6Q0NEnCyR8jMmj2ZicHER/WRNbUN7LNHHEZbyytNmVR2ip7zOOtPWux1sfie?= =?us-ascii?Q?vI4JFQLvQKTG/n++ozsqiNRHxFXirbdvnx9YLYoPpwKyhTxZlfFWEI4qqTWB?= =?us-ascii?Q?0ZGKhjhq7F4uWPd8RGVluXf2E5VgLtHis9BzSQQI7A5UfUmdCiYG7EWQ3jdU?= =?us-ascii?Q?zWxAsIIXO4t2ybb0lOyhTay7HU0CjCTxNpBlvCM4F3dHaWwR31OWlxZOMaMw?= =?us-ascii?Q?Uius/q7pWQTetBVlRgMNYw6qnwW6BfMEIEThnRTD07A1E2lrhSQS/ZaHUs2m?= =?us-ascii?Q?LHp2PlX9sKPg8BrVMJEj9EwYEKup4zfbvnX36JA5ZE5g7jO0wr++QpM1MVjw?= =?us-ascii?Q?TEy3P9PrbQSo2/+jXIBDuaRWi/diwQ3It3JfAhfNBidhPLCDR3lPNsVSeIkf?= =?us-ascii?Q?jlqN2uxzJXaq1H5dEPhiUXiu7m70k4jLZhLVbM5fVvuq5v7JZMEbUwjU33Dr?= =?us-ascii?Q?GE8kcQhz0rKtKduFs0DMIAJYEOoCGrcAHxWU3Ltgl7oiTYI1SQ7OwTlCPYnM?= =?us-ascii?Q?GzdxMCl5XbkFbJIBFsqqoKPr2S1ZwwbxJsliEaXjjCXh57rr2fKkCZJ6k/V3?= =?us-ascii?Q?wstMYiIuRFNNY9I5LwBnCfwnf1dl3O06WZSHU0W6q6jVWJj3qTqZYfMzsNPx?= =?us-ascii?Q?0j31yvGc4XdAa8og/1YsSnKw1TETaUmOpE4UaatDqKQxW51UIerP/uA1UWPJ?= =?us-ascii?Q?xjmhhvuBV6CNSAtIB9DHeLDprGO4ekr6vTBapIKMBw+/nkk4aCtpFGNaTmRP?= =?us-ascii?Q?5ei3u8QBXYa8P15yQb1wnglUjSRXAl38cANP9JyOQaMbzPwTCggusC+Ubb54?= =?us-ascii?Q?/7soP5tMXQiJCxQ+qAFoObHtk+HIQWz7NU2DdjRS1daukBOkHgIRQj9fJH5s?= =?us-ascii?Q?YqGg3n8bGqN9N4sRpY6sR7xe9JkL9fTiDsiO0+2mRw5tOsWhSCqQzaokofio?= =?us-ascii?Q?+xGhPQBd+DUEe6afDS1WIx4fh340kN5HQ9FbL9Necr+SfRbAoIpvi42asZq/?= =?us-ascii?Q?qAYQXWn5/wnDQhHqIMj8gKhxC/9L3CUWgDhPuxQUURLdQhh3DvMIufsR2CTu?= =?us-ascii?Q?njaRiPu3j/Ji4hXMkV2is6vA7BwDH+G6A+HiRlTnuoCcuvbERzwItvy1ec58?= =?us-ascii?Q?ZUNzC7l/4+nx5OTfvT79V4ULv6bvUVyi/aiXqGidKHjPbctEt1pS1rqoCwBI?= =?us-ascii?Q?t1xUiJvSFg7cXo8KsiBt1T+h9lVGON4wsgo20e1i0vrkBy+zlSTurZYtK9zN?= =?us-ascii?Q?m2g71riGQyG1GydgkVZaO0aE/2+R?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA0PR17MB4314.namprd17.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(366016)(1800799024); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bQFiLMgQZIUwjii2TsRZYW2c5UNhNUor9iXiYOabPU4BfTyXTAMhZdp5hJEq?= =?us-ascii?Q?UwfwsXTqC1vShXEvrzdKImfWurWcFZZrPASDvlMUzzf5JOTzWHtfJa9LzYqO?= =?us-ascii?Q?KXVtHcdQh6paPat+aEuOkUnhp6hCWsvjrSHbmcKMFLh6wEq7ih+JsGrMZ6Q2?= =?us-ascii?Q?PByyPBaD0aVnvxDK/6QxA23KXeHoK0Lj0bPv1TSxJ/MifCF53r7WNu55AEaI?= =?us-ascii?Q?iglRbvjS0AXlR/26UowGWepMEOq7i6sdrbYdKI6UMmq9sjVXDNwYccSxDLoC?= =?us-ascii?Q?3tPFIRxq7Ce6tngGRYbHGB5aJipKWhiD6ItweqXWvSFxWoewA8iCeZ7+gl5n?= =?us-ascii?Q?a7lLYjqIiPVxs2guWyTh+l9U2Rc7TdDn381Iqf+VZOqug4d2qnT4+IYOwhKF?= =?us-ascii?Q?5r0baS0Kbg/+hEQ0weticJcaofLpZsXZRR7wrfIquhq/yP4EC9R8yjXFCd3Q?= =?us-ascii?Q?yUnmhuriGTPFgilgL4s4heTjG/b3P+hHG5PC6tdnxg5ohr6FNksIpw+4pmU9?= =?us-ascii?Q?1K98i9+3gAQAlffczqUjCf5mY6sqP2dBa68SlIXepuLO34uwTan+UrweEx0A?= =?us-ascii?Q?bGLjm34IC6y7yytH0CDeBS6+QnAGXNDsLRi1sV+J6Dgg4dgfJDEDQUjbll43?= =?us-ascii?Q?dSWqB0IdLvsBkAkQjai235WlADkjiEzWlN90o/+3iiHhZR73dB3tNcF+LJ27?= =?us-ascii?Q?mo3fXD0uxretkJMKJr/xNxa2qW7xhg+bn8dhXEmJliqNcEEKPwD0+a5VdX6Z?= =?us-ascii?Q?Oi4JsEUPq7SAgPfgRREJRh1Z2dL17Frz+0IFdT5vAKc+0tQYNg073ccYIiu9?= =?us-ascii?Q?jgo/y7Jm7NcmevUCWkfWcLExl+vWDjioFIDRNWIvKx87GocOapyZ+K+x+LAg?= =?us-ascii?Q?XYVPOdZkz6S+pEngTWXGCbH7bfUwpOtvonxqirfVTeHmFpQ25WeBTPfNEolM?= =?us-ascii?Q?WVO8TOJaNQ9lbd7XLz2ZxRA9wZeus6FNX3QG8LEJIHaignVpnU9fpLp0oGUM?= =?us-ascii?Q?N/uDBEtv+85dc+he59nLyOwBSHz8bBm28qatsb9vs5MUV8XZ+BtUPOoNCqrn?= =?us-ascii?Q?EVs5mjAG3orCM2gOcCMO4TlidipN2B6wIpb8YdcRP/p3DZPGOX9AWAZFBsZP?= =?us-ascii?Q?u0VUOgPK7WrGuFOcLiF5W6tusi37MDUgrGlan3GUpJBic1DP3Vs7T9JXjBpq?= =?us-ascii?Q?AFHlmTGM5lh7W4+dwvXgY/x68TL4LL5tSYgu1gTTkxLnyaQfiNf0uAqjNuBN?= =?us-ascii?Q?WtMERP3GEQs6JClxU36x+It8kNaMhT1IhEXpRj3b9SMnql2ho6hvjBDbY9UL?= =?us-ascii?Q?nUq05GSqAjS/gC/S2cNT+Pawi9TulPfcZH2ptlx5n6PNhh4ocz9WuWfiGqM2?= =?us-ascii?Q?TT9S+YmQW63+95rHuxkbuRCwaEKhYNRPJ9ruTmT4rmE46cl2WWxqHYl7ptSN?= =?us-ascii?Q?nf5zb2CgHeetonx55P0e/r6k4lcCiWQHWxJyHwcpPkSQzHTZYAl73gMP81Mb?= =?us-ascii?Q?RaGbjfFW2SgHa4GuH1zhRjKnUAUDWkahUOX80VI6p0+6qptBAcKAcCVJCMEQ?= =?us-ascii?Q?oKWgPtBce+mf8+dKEif27YY2cceQCgMLB37BaQjE?= X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: adb362da-1ece-47c5-73b9-08dd3ebfbae6 X-MS-Exchange-CrossTenant-AuthSource: SA0PR17MB4314.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jan 2025 10:45:35.2645 (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: NFWKd4y4giIxjxFNIZdYN3ClVdP5wgzDU1eixp6M5/XinKkD4w+tU/tsEW8XMOkKWLAwfYZkJ73JFWEUHu07kg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR17MB6954 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _kUxLM_ViuDlEfkZgdLMwvnMcKKpcXMn61aOzO-IuiE_1737974736 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 changes symtab_to_symtab_object() so that each it is called with a particular struct symtab * it returns the very same gdb.Symtab object. This is done by searching per-objfile linked list of instances and - if found - return it rather than creating new gdb.Symtab. --- gdb/python/py-symtab.c | 18 ++++++++++++++++- gdb/testsuite/gdb.python/py-symtab.exp | 28 ++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c index 99a5094ba60..7b51e211daf 100644 --- a/gdb/python/py-symtab.c +++ b/gdb/python/py-symtab.c @@ -449,7 +449,7 @@ set_symtab (symtab_object *obj, struct symtab *symtab) { obj->symtab =3D symtab; obj->prev =3D NULL; - if (symtab) + if (symtab !=3D nullptr) { obj->next =3D stpy_objfile_data_key.get (symtab->compunit ()->objfil= e ()); if (obj->next) @@ -467,6 +467,22 @@ symtab_to_symtab_object (struct symtab *symtab) { symtab_object *symtab_obj; =20 + /* Look if there's already a gdb.Symtab object for given SYMTAB + and if so, return it. */ + if (symtab !=3D nullptr) + { + symtab_obj =3D stpy_objfile_data_key.get (symtab->compunit ()->objfi= le ()); + while (symtab_obj !=3D nullptr) +=09{ +=09 if (symtab_obj->symtab =3D=3D symtab) +=09 { +=09 Py_INCREF (symtab_obj); +=09 return (PyObject*)symtab_obj; +=09 } +=09 symtab_obj =3D symtab_obj->next; +=09} + } + symtab_obj =3D PyObject_New (symtab_object, &symtab_object_type); if (symtab_obj) set_symtab (symtab_obj, symtab); diff --git a/gdb/testsuite/gdb.python/py-symtab.exp b/gdb/testsuite/gdb.pyt= hon/py-symtab.exp index 4765ef5cb2f..18d77a0296f 100644 --- a/gdb/testsuite/gdb.python/py-symtab.exp +++ b/gdb/testsuite/gdb.python/py-symtab.exp @@ -90,6 +90,34 @@ gdb_test_multiple "python print (\"simple_struct\" in st= atic_symbols)" \ =09} } =20 +# Test symtab identity +gdb_test "python print (symtab is symtab)"\ + "True" \ + "test symtab identity 1" +gdb_test "python print (symtab is gdb.selected_frame().find_sal().symtab)"= \ + "True" \ + "test symtab identity 2" +gdb_test "python print (sal.symtab is gdb.selected_frame().find_sal().symt= ab)"\ + "True" \ + "test symtab identity 3" +gdb_test "python print (symtab is not \"xxx\")"\ + "True" \ + "test symtab non-identity with non-symtab" + +# Test symtab equality +gdb_test "python print (symtab =3D=3D symtab)"\ + "True" \ + "test symtab equality 1" +gdb_test "python print (symtab =3D=3D gdb.selected_frame().find_sal().symt= ab)"\ + "True" \ + "test symtab equality 2" +gdb_test "python print (sal.symtab =3D=3D gdb.selected_frame().find_sal().= symtab)"\ + "True" \ + "test symtab equality 3" +gdb_test "python print (symtab !=3D \"xxx\")"\ + "True" \ + "test symtab non-equality with non-symtab" + # Test is_valid when the objfile is unloaded. This must be the last # test as it unloads the object file in GDB. gdb_unload --=20 2.45.2