From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id YY55HxnNmGnGNAMAWB0awg (envelope-from ) for ; Fri, 20 Feb 2026 16:07:37 -0500 Authentication-Results: simark.ca; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=OgR/uW9G; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 7AF681E0BA; Fri, 20 Feb 2026 16:07:37 -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 A35971E08D for ; Fri, 20 Feb 2026 16:07:36 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 313CB4B9DB75 for ; Fri, 20 Feb 2026 21:07:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 313CB4B9DB75 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=OgR/uW9G Received: from mail-oa1-x31.google.com (mail-oa1-x31.google.com [IPv6:2001:4860:4864:20::31]) by sourceware.org (Postfix) with ESMTPS id 64C9C4BA23EE for ; Fri, 20 Feb 2026 21:03:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 64C9C4BA23EE Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 64C9C4BA23EE Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:4860:4864:20::31 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771621431; cv=none; b=HxC5n9U8Nc0aPkBXVjTcDD0ePPoOXxMWxdwGgTfp6z3zTJeAO0Ua22IsGnf2v8JhBZRhMBVwzwdC53k9HMY6FfhSlVKxYDCao+40B9RIzrzTdJS4T7RTcdHgKL7ss4NXw+/O9IUQZPLmO/bFasXAFgIdNkCcSaQReOZQ6nmDai0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1771621431; c=relaxed/simple; bh=gcGB15XFW8GZHh8meBt7m9v/AtgOQoe1B/PHDcIKPoU=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=d2i0fE616f0qbz23oanBkO72nODooWYpsM5vAK+Kzfzt4X7Cyd3SjQdNhTOl8QBxLEfCZEK2Cq4qyL2sS4iLl4BJNLmel1gwowTLxgxitBmxm4Vut/xEAd9T4HJ2kvZuPVFyahbYil/BwMHqeW4PQtE5NYq+KebS1zx38XJDmDw= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 64C9C4BA23EE Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-40f20af93aaso835011fac.1 for ; Fri, 20 Feb 2026 13:03:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1771621430; x=1772226230; darn=sourceware.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=HvFQEs4bVuoQvKsUgRqvqexC+Em6c/r5HT73qg/QPh8=; b=OgR/uW9GRqU+8UPH6N8gwX9RYFMFBiJ3i3XrZgf7ypKibejeTg86lS0SKTayvm4/d8 TLRSwqPK5DBZxTzqUcE2B999/zLKf8KAn7S+lNRitLqvsZRoBIS/wFsXTPSncKCQ0mVO fd6CqULhvReymLiduFOcWqg3AYtQPk1T2NneBAzX+1+LGB7xnRVJ/g2gRn90b+WGV9gh VhnG92dDNSZnxyy53PYDaBNHgqdsstGQtONo9BladrGBUTFYj035DyFf9Euo5vSfswnc raOdF16Yt40M0aom2eu+S0inWCsDDA6/dLN6lAfN3AMlBnwKXKLEwPcCUsdPpJnmHkX7 WO+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771621430; x=1772226230; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=HvFQEs4bVuoQvKsUgRqvqexC+Em6c/r5HT73qg/QPh8=; b=MoT+4YjG9AF4Abf4Y7Im190+OKheojS+C9hXVFer8qyMydMhJvpL6bAYbR1QwTbDSX YEO3gZZrevvX3GsJgWMHT2OqUvw0IHNo+Xl2fmmNjUBiYLqooj++yaacZzUGJ9HZApOK Z0ZINBxUHatwjG8hNm+LgWk6GlgKvdgilJjOiadaJa9U3N/csktLi3sEYdR696P4zIbQ S7guOmfv9UP9Miml+SM48/0eMjRqWsYRW9rIoib5wT2BRV8kSBP6Dw9UxTBuRXbVoWJK 3iORsuBg957hXZpL63DlR6hG3klDdyJSB3HCAE+Sugnbwap/2Qt28WQoLLkKOexEb07I 62IA== X-Gm-Message-State: AOJu0YyLJvMTWWPCCqEJ6yvkDjzVat+EaGxkOgBwXMwF9ZP34uCZTcat xKjWtw14MHIX+ql3s248GlnvsO+Izo7FWHLmq92F0AglOORO6bc8U2yccFS8sOmjkTCSnsW1Nf8 Yq04= X-Gm-Gg: AZuq6aL6CFsP6LDgP4C3BI/QS5O1dNJL1YqI/hIuO0C6UJlORKutZ0nrzMnMiafx5ka u5rluRLFve9mL/Nl0ZbrIgfQmftK1Yp63cknBEvinYPjv27cMKt5V3YoOxJvMmytl9cbyaUaKrf EdDZYuAPmIQXqZCzkxxojcqu1Hp4KRIZzE2RxO3NX60VNIUzhjhmHXTTcxGbL98wBB6osqKp6kd d+mJz5VWyqk8XBqFoggTbqM+TnsBKrvQrjji5NzRkvnQAk4EJVdk6m2dXlAHYJ2K6vhUQ+qmwcv ouANIkDToLS5D2k4h1kHDJ4e+Q+mf8nw4ca9q2lcFjAVuTzBkem8qVGl1yxtcsWQ7uX4fntUR54 6L7VypGjfLuqvlXWcdZqtnno8a7LQvO7C2oNKzKGNsNZ3g0HENYEkEYvzi2OntGDfQnLDyx+5cu JRlMBHXXv2FS4Npi1+O5XdPrGXqIHC+LraCWgXf5Xpa2HTVOMq82msG6raenVk+Fm6sUo= X-Received: by 2002:a05:6871:5214:b0:40f:c84:e57b with SMTP id 586e51a60fabf-4157b0c19c4mr642917fac.28.1771621430536; Fri, 20 Feb 2026 13:03:50 -0800 (PST) Received: from [192.168.0.26] (97-122-122-234.hlrn.qwest.net. [97.122.122.234]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-4157d2d7826sm561630fac.10.2026.02.20.13.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Feb 2026 13:03:50 -0800 (PST) From: Tom Tromey Date: Fri, 20 Feb 2026 14:03:48 -0700 Subject: [PATCH 02/10] Return gdbpy_ref<> from symbol_to_symbol_object MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260220-python-safety-minor-v1-2-4c4b12e445af@adacore.com> References: <20260220-python-safety-minor-v1-0-4c4b12e445af@adacore.com> In-Reply-To: <20260220-python-safety-minor-v1-0-4c4b12e445af@adacore.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.3 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 changes symbol_to_symbol_object to return a gdbpy_ref<>, using the type system to convey that a new reference is always returned. --- gdb/python/py-block.c | 6 ++--- gdb/python/py-finishbreakpoint.c | 2 +- gdb/python/py-frame.c | 2 +- gdb/python/py-objfile.c | 4 ++-- gdb/python/py-record-btrace.c | 2 +- gdb/python/py-symbol.c | 51 +++++++++++++++++----------------------- gdb/python/py-unwind.c | 2 +- gdb/python/python-internal.h | 2 +- 8 files changed, 32 insertions(+), 39 deletions(-) diff --git a/gdb/python/py-block.c b/gdb/python/py-block.c index bebbb32d844..718aca17829 100644 --- a/gdb/python/py-block.c +++ b/gdb/python/py-block.c @@ -127,7 +127,7 @@ blpy_get_function (PyObject *self, void *closure) sym = block->function (); if (sym) - return symbol_to_symbol_object (sym); + return symbol_to_symbol_object (sym).release (); Py_RETURN_NONE; } @@ -274,7 +274,7 @@ blpy_getitem (PyObject *self, PyObject *key) for (struct symbol *sym : block_iterator_range (block, &lookup_name)) { /* Just stop at the first match */ - return symbol_to_symbol_object (sym); + return symbol_to_symbol_object (sym).release (); } PyErr_SetObject (PyExc_KeyError, key); @@ -412,7 +412,7 @@ blpy_block_syms_iternext (PyObject *self) return NULL; } - return symbol_to_symbol_object (sym); + return symbol_to_symbol_object (sym).release (); } static void diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c index 14e9f18c863..43dffd64adc 100644 --- a/gdb/python/py-finishbreakpoint.c +++ b/gdb/python/py-finishbreakpoint.c @@ -268,7 +268,7 @@ bpfinishpy_init (PyObject *self, PyObject *args, PyObject *kwargs) PyErr_Clear (); self_bpfinish->func_symbol - = symbol_to_symbol_object (function); + = symbol_to_symbol_object (function).release (); PyErr_Clear (); } } diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c index 8b50307c099..e98edd52cfb 100644 --- a/gdb/python/py-frame.c +++ b/gdb/python/py-frame.c @@ -351,7 +351,7 @@ frapy_function (PyObject *self, PyObject *args) } if (sym) - return symbol_to_symbol_object (sym); + return symbol_to_symbol_object (sym).release (); Py_RETURN_NONE; } diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c index 36acdb06a25..16584f7c8f8 100644 --- a/gdb/python/py-objfile.c +++ b/gdb/python/py-objfile.c @@ -477,7 +477,7 @@ objfpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw) if (sym == nullptr) Py_RETURN_NONE; - return symbol_to_symbol_object (sym); + return symbol_to_symbol_object (sym).release (); } catch (const gdb_exception &except) { @@ -512,7 +512,7 @@ objfpy_lookup_static_symbol (PyObject *self, PyObject *args, PyObject *kw) if (sym == nullptr) Py_RETURN_NONE; - return symbol_to_symbol_object (sym); + return symbol_to_symbol_object (sym).release (); } catch (const gdb_exception &except) { diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c index 90d9ecd95a8..1974dd3e939 100644 --- a/gdb/python/py-record-btrace.c +++ b/gdb/python/py-record-btrace.c @@ -354,7 +354,7 @@ recpy_bt_func_symbol (PyObject *self, void *closure) if (func->sym == NULL) Py_RETURN_NONE; - return symbol_to_symbol_object (func->sym); + return symbol_to_symbol_object (func->sym).release (); } /* Implementation of RecordFunctionSegment.instructions [list] for btrace. diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index 736774bd94f..d51f4823315 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -336,7 +336,7 @@ set_symbol (symbol_object *obj, struct symbol *symbol) /* Create a new symbol object (gdb.Symbol) that encapsulates the struct symbol object from GDB. */ -PyObject * +gdbpy_ref<> symbol_to_symbol_object (struct symbol *sym) { symbol_object *sym_obj; @@ -348,13 +348,13 @@ symbol_to_symbol_object (struct symbol *sym) else sym_obj = sympy_registry.lookup (sym->arch (), sym); if (sym_obj != nullptr) - return (PyObject*)sym_obj; + return gdbpy_ref<> (sym_obj); sym_obj = PyObject_New (symbol_object, &symbol_object_type); if (sym_obj) set_symbol (sym_obj, sym); - return (PyObject *) sym_obj; + return gdbpy_ref<> (sym_obj); } /* Return the symbol that is wrapped by this symbol object. */ @@ -409,7 +409,7 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw) const char *name; static const char *keywords[] = { "name", "block", "domain", NULL }; struct symbol *symbol = NULL; - PyObject *block_obj = NULL, *sym_obj, *bool_obj; + PyObject *block_obj = NULL, *bool_obj; const struct block *block = NULL; if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s|O!i", keywords, &name, @@ -448,18 +448,16 @@ gdbpy_lookup_symbol (PyObject *self, PyObject *args, PyObject *kw) if (ret_tuple == NULL) return NULL; + gdbpy_ref<> sym_obj; if (symbol) { sym_obj = symbol_to_symbol_object (symbol); - if (!sym_obj) - return NULL; + if (sym_obj == nullptr) + return nullptr; } else - { - sym_obj = Py_None; - Py_INCREF (Py_None); - } - PyTuple_SET_ITEM (ret_tuple.get (), 0, sym_obj); + sym_obj = gdbpy_ref<>::new_reference (Py_None); + PyTuple_SET_ITEM (ret_tuple.get (), 0, sym_obj.release ()); bool_obj = PyBool_FromLong (is_a_field_of_this.type != NULL); PyTuple_SET_ITEM (ret_tuple.get (), 1, bool_obj); @@ -477,7 +475,6 @@ gdbpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw) const char *name; static const char *keywords[] = { "name", "domain", NULL }; struct symbol *symbol = NULL; - PyObject *sym_obj; if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s|i", keywords, &name, &domain)) @@ -493,19 +490,17 @@ gdbpy_lookup_global_symbol (PyObject *self, PyObject *args, PyObject *kw) return gdbpy_handle_gdb_exception (nullptr, except); } + gdbpy_ref<> sym_obj; if (symbol) { sym_obj = symbol_to_symbol_object (symbol); - if (!sym_obj) - return NULL; + if (sym_obj == nullptr) + return nullptr; } else - { - sym_obj = Py_None; - Py_INCREF (Py_None); - } + sym_obj = gdbpy_ref<>::new_reference (Py_None); - return sym_obj; + return sym_obj.release (); } /* Implementation of @@ -518,7 +513,6 @@ gdbpy_lookup_static_symbol (PyObject *self, PyObject *args, PyObject *kw) int domain = VAR_DOMAIN; static const char *keywords[] = { "name", "domain", NULL }; struct symbol *symbol = NULL; - PyObject *sym_obj; if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "s|i", keywords, &name, &domain)) @@ -561,19 +555,17 @@ gdbpy_lookup_static_symbol (PyObject *self, PyObject *args, PyObject *kw) return gdbpy_handle_gdb_exception (nullptr, except); } + gdbpy_ref<> sym_obj; if (symbol) { sym_obj = symbol_to_symbol_object (symbol); - if (!sym_obj) - return NULL; + if (sym_obj == nullptr) + return nullptr; } else - { - sym_obj = Py_None; - Py_INCREF (Py_None); - } + sym_obj = gdbpy_ref<>::new_reference (Py_None); - return sym_obj; + return sym_obj.release (); } /* Implementation of @@ -622,9 +614,10 @@ gdbpy_lookup_static_symbols (PyObject *self, PyObject *args, PyObject *kw) if (symbol != nullptr) { - PyObject *sym_obj = symbol_to_symbol_object (symbol); + gdbpy_ref<> sym_obj = symbol_to_symbol_object (symbol); if (sym_obj == nullptr - || PyList_Append (return_list.get (), sym_obj) == -1) + || PyList_Append (return_list.get (), + sym_obj.get ()) == -1) return false; } } diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index 96e11137be6..a71aaac7335 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -696,7 +696,7 @@ pending_framepy_function (PyObject *self, PyObject *args) } if (sym != nullptr) - return symbol_to_symbol_object (sym); + return symbol_to_symbol_object (sym).release (); Py_RETURN_NONE; } diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index feabf270464..979bf2498da 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -497,7 +497,7 @@ PyObject *gdbpy_register_tui_window (PyObject *self, PyObject *args, gdbpy_ref<> symtab_and_line_to_sal_object (struct symtab_and_line sal); PyObject *symtab_to_symtab_object (struct symtab *symtab); -PyObject *symbol_to_symbol_object (struct symbol *sym); +gdbpy_ref<> symbol_to_symbol_object (struct symbol *sym); PyObject *block_to_block_object (const struct block *block, struct objfile *objfile); PyObject *value_to_value_object (struct value *v); -- 2.53.0