From patchwork Wed Mar 19 21:22:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Vrany X-Patchwork-Id: 108570 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8FF3D385770D for ; Wed, 19 Mar 2025 21:24:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8FF3D385770D X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org 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 0E42F3858027 for ; Wed, 19 Mar 2025 21:22:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0E42F3858027 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 0E42F3858027 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=1742419372; cv=none; b=fwfEhra4nTtfNdPfK8QFT5HUvjp1c06qo9f+n7wDgA2ZFDDZJZNxKdWflWnehvAkJJyG6ysvJ67FBW9T7lsTVxujlPjUBQtWJhtns8x8jASLSNwK8HetfwHJ+KB/Raq3uqxXUXyp9JxWrhhnKWZ6o+MKEal+aWw+kb9LGyyzkN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742419372; c=relaxed/simple; bh=KRT8ZE3/03wVHdjsmwHsoKD83VWWIakdSn5QHxQvOtY=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Hq1IFdHv2CdtiTH7wQMc3c/ZhMw8AggAKPD5G0An9KRTC1ClGK+yChiMTf6f3Aa/mvRTszBPCCZCGmfttnPL9i0XEcivpc0uPaqiI/DzjF9XiCJqxVdI1VE5lLZqRklP6uIxB7tG3v2KJeU5T6sr+6tsZrfH+YCWxr0Y1m21DOI= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E42F3858027 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04lp2173.outbound.protection.outlook.com [104.47.73.173]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-5-Yj2lquv5P1CLB60cZt-dNg-1; Wed, 19 Mar 2025 17:22:50 -0400 X-MC-Unique: Yj2lquv5P1CLB60cZt-dNg-1 X-Mimecast-MFC-AGG-ID: Yj2lquv5P1CLB60cZt-dNg_1742419369 Received: from SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) by IA1PR17MB6694.namprd17.prod.outlook.com (2603:10b6:208:3da::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Wed, 19 Mar 2025 21:22:48 +0000 Received: from SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::38a7:a6f2:3b95:bc26]) by SA0PR17MB4314.namprd17.prod.outlook.com ([fe80::38a7:a6f2:3b95:bc26%7]) with mapi id 15.20.8534.031; Wed, 19 Mar 2025 21:22:48 +0000 From: Jan Vrany To: gdb-patches@sourceware.org CC: Jan Vrany , Tom Tromey Subject: [pushed] gdb/python: do not hold on gdb.Type object from gdb.Value Date: Wed, 19 Mar 2025 21:22:07 +0000 Message-ID: <20250319212212.490510-5-jan.vrany@labware.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250319212212.490510-1-jan.vrany@labware.com> References: <20250319212212.490510-1-jan.vrany@labware.com> X-ClientProxiedBy: AM0PR10CA0074.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:15::27) To SA0PR17MB4314.namprd17.prod.outlook.com (2603:10b6:806:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA0PR17MB4314:EE_|IA1PR17MB6694:EE_ X-MS-Office365-Filtering-Correlation-Id: c01db705-d688-4614-3eaa-08dd672c326f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014 X-Microsoft-Antispam-Message-Info: UYTNKo/OyVhL1VZ33TcLQfeRsGSXSICy71IxluA/cL/hmF2fzVJNPL+FZPdrfxo/mRJfJ4P+vEcswshfqoVGgg9YurUFjXzX3xQaeVyOkj0MTQY3tWNEHOT1WDubs4w2jT2d6ck64MwUcu06wCUKPuw4nJKNbRpeGaEb9VbSMyKk4cxopfQA1Jl5RmWcb7bmWgYeHc3uATtyFyoXSMTpsR6pIhMXBvMIk/PM5a8Fcqihk/oFeCFzvqmWGxaXaG13OYBqQSPODjuM8gbsZ03+oRjv+weI4ooqjSzj3KFTfE20B8xxOMzk3vVobOW04TO7ehgS0T2rsjmUcND52sk+aFVktMnaVxEfJiYKFk2+pdI0KSKaGciLO51QFeryxbwAmX74TorNyNuL4dpbPSdluv1ezy/NJVcIi5uBfYZsAmdzKD3m2ZDgN8QEPT9Koi6GvG+Z1DOo7z1NYvtmVzjy/lvKhMYpPLgIiOxn6eezkfiv47lSw8bcdW1bq4OMDTqK9c1vPbM08VkRdLIRWaBSsChEJiHca9GZkTTd0NyVs4kBuebuNrix3YYnW904AiB2+DaPPSN8YhrNpgAp6Ag+fHjZOE2COTppCjRNQHMBI9HfL0bwnUSi1tKPYLLm/0P3IYcUFn21HuyFBB0Q1PSolwLND0+wYCGBGrJTxshS2P8yoX8pi0CUGZeG0q44hKDet5ahlacnVwTZ7YNF8fCirWELbLgL5rW8wadENDlV9MInSjrQz2mOIYJSpJr2mF9Ww2xjbFZtvNUqzplx4GLOeL0rlDQ+g/llfxlKBcFmSsUVvGHbRFbXkLYGmPJwuWlcPHtGF+THf74KZMPLJ1REMQD4eQA7ITevYbAB1CUWNY8uEhBE5199YTgNfbwb58aI9nLRehuIpDO5Iem61a+HPwLr89HDkmD3rM3UnhafTNRoz5bTE+w/91wTOAqk0rBkas9iuSU/bdXqPRubGpJhQJFQkYbHt1ROKZ8gPUGMh6YZt5i/ArK9voWxQrpMLByh1rbvFGelT2omo3RBmPji2yOlk7Q5W2tjTLAS2u0gzolEV5gzdnEr7tNy9fqvGew4OFPtcrvHHptdBUxfl28G3MlqA0wYTAiQmHGi+pZcJ3zPaFBAT0a0qBNhIagV4isnkQ/aBt+pYlCuhSPMlLQfCA6To1JOhqEA2mt8zKqA5+WIkXGRU32mReqHGZFoiE1miX8oj0pPQ440zpJXZ/Zrcwk3XanF6DYDuCWy5T3ksdGhIby8ZzLHRxr3rc44ch2YYTp5MwYiR1C3E/dDOMWq53GBURQaiZHH6MMkilkJjw3sWTvyuG2AaQLNxcp8765KdGKO5vtKMcMsbqQHoYpLfRgonmcPm+ZqxNki+majfiZaIriQqp/IZDN/JGXnw0Yx 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)(366016)(1800799024)(376014); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J8Wn7MRnnpIXjxG2gg2Onp8tYXjeZHeSOytTBRouV+e943YRjXLGINl8EL/GmZZkx/EyO236uTomm5OlrVjSYxUtLUk8I9c/ZDDp17k+wDNOvmRX2aYU4DYbbTuXD6LX9DGzQxs9QIR0jLGX9wlr7VnYMLvcmCmcf80Qp7ueMYLfB9r4TQ/t7VY9csjxNAhJ6D2Gx7b8bu6WlKuI7cctp3HWEqa/LJ77hkjwNBAeAW3vBBYj2pwx3PnTjHW7FrqkFwW9s2Rc/javr4+wOFOyf3rpxFi4XeFHLaB+s1KoYnVsmdYIgmcSJvC6OhfCvAzh6ZYoHN8V/5fuNwB2rUWUAGdhdThEiejmCjJ7AIjrfZFdMoJiDf0gTkeSSRcylsTTacuJxgAiWYcLFyYD2JS8BAZRld4J1wTk+5Lsyy0Oiv0tP5FVGutuT8FvDuJ0+XuvQemIFFqZBOyx671aBR8XTEYsY8SKJKMYqjgXh/VdkXY00OPKGPY8xUwFADK/mHvlPhGBvf2vuw76scJs1xYuaG1KATpzxfDQEinvYr+qi8MC8LM405zQ/gGptrFal/cVKZjXwXftpzATVqYwP/fGmky6hegRZo9uMttf7ihhAZuHllJdy6tf5xhi3fzPYm3JnzBfnA6FB2UY1GVKPIHzKtCcs9Lh3psFG/ljgMPt9X9bMs7CID2VtQrzxaCOI2T2iCrx2BXDqTNwGzJiDpB5f3KSjwy3Bk4tNdrnc6C2vumfOoL+CgH252XEFylBqiz5gNrDBJkjlhsnsdoyArlXeqAwPEgeimtFsWNji2dzL8GVJ7URuAAtmBn9HS9iBHMwyehkbqnWuoQfn384EolkxtuSULT4lMo9g9cegErTB5Ple55kUaAqC+s8XKQPmj8GinPDbWkMZulaDdH7Imx497FY3Hp4mG4TuhN/1zyMItd62oa+SHTdipmj4T9FYH87Ky2kK16UAutX7M7J9FU0qH3l+Bnx+x28QNy4zIHiDxAD/TNOcikPWZw90I07WdYNontnzUizLSzqmUBBwT2CZ9kpvIJTXu9zPl5YLPdO6S3Ze/cBIsoGsBMB6P6x3J9C1mc0MkwfyQlseTi3OYkL2d6AuQzX0U6txDCTcWvXtaMnwOaRR3KIk8k7ZET3hHkarHXx9ye7NSV7RnruebkDWencwKQaK+qwBpkhlrAAHRXWfU3saMjohUVVHW+8F5o4Pe1q+Uvx1CG+79q4cVVCnvzL7efGe7sl2NFrXEkfaJ50EljC+Fp+WB4unrCdyZ3dv5Gd7jiMyO2TjIZGgNgm14qSR2TyCVMmBEnOlALg6HyM7kVOt4MosaynaJpULJ+wKJUn5rjbFgq0VfGcuyB4hZQvKUgIdRymiX4trwqb+2iFLHvfgOaPTWLN+iQ3vqvng+Kr1JoiDmUccslBeEPbaqCTbxg9ZVl51buMyWL+5rzhZykpuLKkdFemQgjdSneEUQ9v5mLVwL+hBz7NKOt/WYuAkC9j5qCSQyZQ7kh2LdTmmN92Gxv0ZrclWoNCHlQALoeexHfZfXcuka3RxW+hVncf6SWe95ZD6dEt/lrD0BVSj4EIJqEaJybOqKCY+js3 X-OriginatorOrg: labware.com X-MS-Exchange-CrossTenant-Network-Message-Id: c01db705-d688-4614-3eaa-08dd672c326f X-MS-Exchange-CrossTenant-AuthSource: SA0PR17MB4314.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2025 21:22:48.0669 (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: IsBvsj9xdCCJN6s6BprFzUKSe+imxCuptxjILsZCFfw0eh0W3fZrWhFk0xw8NTfNVkh+xmQZxzbH3BHjHfrznA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR17MB6694 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: JiA7H9GxlzAVam-tOorxyHaOEOlDBFzW3y6a-najLzM_1742419369 X-Mimecast-Originator: labware.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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~patchwork=sourceware.org@sourceware.org Previous commit changed type_to_type_object() so each time it is called with particular struct value* it returns the same object. Therefore there's no longer need to hold on type objects (gdb.Type) from struct value_object in order to preserve identity of gdb.Type objects held in value_object::type and value_object::dynamic_type members. This in turn allowed for some simplification in various functions. While at it I changed a couple of NULLs to nullptrs. Approved-By: Tom Tromey --- gdb/python/py-value.c | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 02c50b48fd2..cf1e3eae45d 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -60,7 +60,6 @@ struct value_object { struct value_object *prev; struct value *value; PyObject *address; - PyObject *type; PyObject *dynamic_type; PyObject *content_bytes; }; @@ -84,8 +83,6 @@ valpy_clear_value (value_object *self) self->value = nullptr; Py_CLEAR (self->address); - Py_CLEAR (self->type); - Py_CLEAR (self->dynamic_type); Py_CLEAR (self->content_bytes); } @@ -438,14 +435,7 @@ valpy_get_type (PyObject *self, void *closure) { value_object *obj = (value_object *) self; - if (!obj->type) - { - obj->type = type_to_type_object (obj->value->type ()); - if (!obj->type) - return NULL; - } - Py_INCREF (obj->type); - return obj->type; + return type_to_type_object (obj->value->type ()); } /* Return dynamic type of the value. */ @@ -454,13 +444,7 @@ static PyObject * valpy_get_dynamic_type (PyObject *self, void *closure) { value_object *obj = (value_object *) self; - struct type *type = NULL; - - if (obj->dynamic_type != NULL) - { - Py_INCREF (obj->dynamic_type); - return obj->dynamic_type; - } + struct type *type = nullptr; try { @@ -493,23 +477,14 @@ valpy_get_dynamic_type (PyObject *self, void *closure) else if (type->code () == TYPE_CODE_STRUCT) type = value_rtti_type (val, NULL, NULL, NULL); else - { - /* Re-use object's static type. */ - type = NULL; - } + type = val->type (); } catch (const gdb_exception &except) { return gdbpy_handle_gdb_exception (nullptr, except); } - if (type == NULL) - obj->dynamic_type = valpy_get_type (self, NULL); - else - obj->dynamic_type = type_to_type_object (type); - - Py_XINCREF (obj->dynamic_type); - return obj->dynamic_type; + return type_to_type_object (type); } /* Implementation of gdb.Value.lazy_string ([encoding] [, length]) -> @@ -1937,15 +1912,14 @@ value_to_value_object (struct value *val) value_object *val_obj; val_obj = PyObject_New (value_object, &value_object_type); - if (val_obj != NULL) + if (val_obj != nullptr) { val->incref (); val_obj->value = val; val_obj->next = nullptr; val_obj->prev = nullptr; - val_obj->address = NULL; - val_obj->type = NULL; - val_obj->dynamic_type = NULL; + val_obj->address = nullptr; + val_obj->dynamic_type = nullptr; val_obj->content_bytes = nullptr; note_value (val_obj); }