From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id ValpL6AzeGpJWRYAWB0awg (envelope-from ) for ; Sun, 09 Aug 2026 04:00:32 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=PyUubAyN; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=owMTKqge; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LdIdGrcO; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=icvqZmwT; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id A73501E033; Sun, 09 Aug 2026 04:00:32 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.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 autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [IPv6:2620:52:6:3111::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 09B911E033 for ; Sun, 09 Aug 2026 04:00:30 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD9C24BA79B7 for ; Sun, 9 Aug 2026 08:00:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD9C24BA79B7 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=PyUubAyN; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=owMTKqge; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LdIdGrcO; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=icvqZmwT Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 749884BA799C for ; Sun, 9 Aug 2026 08:00:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 749884BA799C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 749884BA799C Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1786262402; cv=none; b=AawVFPeozpRjVIikLWR2ljwZFjh8jtXBzqQId8BeaPjSK13RKFdVuUiudXSWvCXNssVe9A/nSu92mQsJyx8Wkg9CKDO26hMZDvtol8OjbfCyieg9FH3vzn/wIQ/ysotV1+wABK8+eOT1s0hQyUwFgEK7YCtJd5X+ffO1V9QkNb8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1786262402; c=relaxed/simple; bh=bQ9hYU9pdt2nOSdKV5DZ122RmpH38NP3Qui3l1NKx3o=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=a+LCzNUjaiWX2g9lsTE7Wh5iQlj8vxFyBhdFudx0QpiV8tbWt15FSl2YlTNB7LOO9Dre4tObItjkh93XRujNZGaLiXrDke+72QbL0+eUX5vLeqgrY2tqAkcMB5zmxaR/R3BV9yXa18dvzXsNhbDCboFvXbM4PI9fCdGU1uAKY5g= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=PyUubAyN; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=owMTKqge; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=LdIdGrcO; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=icvqZmwT DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 749884BA799C Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D8FF5813F4 for ; Sun, 9 Aug 2026 07:59:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1786262397; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=d95jRCraNSSv1FMvGFJkCFr2IlZZD6nfaah0CNo+Oo0=; b=PyUubAyNYPiH/YEygrr4hxq8r7xzHp3XsJ6d0JGwj+aTj6JK+EQdfy7waXZn5m5x2riVfz uBPSsv+xoOHp/oCIH8FvisDhO1SBMjKpvM4T21UXzm5KpjH6RpUFcj10pHFO3szt/mZUdb Son0nDbyW4MfrMSa7Uljc0H2WBJAg6s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1786262397; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=d95jRCraNSSv1FMvGFJkCFr2IlZZD6nfaah0CNo+Oo0=; b=owMTKqgetIC6YCDYwK4oF8ii4jmAXIjSCSChMvPd/26mIo6pKZTgDCLJHdooTrpgt7fhai x7oav+wQZ423XLAg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=LdIdGrcO; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=icvqZmwT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1786262392; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=d95jRCraNSSv1FMvGFJkCFr2IlZZD6nfaah0CNo+Oo0=; b=LdIdGrcO3qmGXGpiuz804iLUrVBSItogX9NIzVoX9qqfbBWn3w1tCH8Yr7/dVe4D22TXWa +lAHMSujFrXtxoRj2kH4FlNCSVBAjqgHazV8G8cbE6VHkhH/XsY6jfsiTgzcNCpFbsqUhA KS1vbx30elqhnQrKMGoSPwYbNbLpDhA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1786262392; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=d95jRCraNSSv1FMvGFJkCFr2IlZZD6nfaah0CNo+Oo0=; b=icvqZmwTB1krMuFbD7yV30UYo9MXUxY/ohvW+OYCvCkFZsEX1Ckfy+8sPo/81z5UHcMPgv KUquldY5M6ZaWiBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BF931779B2 for ; Sun, 9 Aug 2026 07:59:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id vyfXLHgzeGo8WQAAD6G6ig (envelope-from ) for ; Sun, 09 Aug 2026 07:59:52 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/python] Convert valpy_call to the "python safety" approach Date: Sun, 9 Aug 2026 09:59:52 +0200 Message-ID: <20260809075952.3244926-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Queue-Id: D8FF5813F4 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_NONE(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:dkim]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.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~public-inbox=simark.ca@sourceware.org Update function valpy_call to the "python safety" approach. I added a wrap_tp_call template to enforce and handle the new prototype of valpy_call: ... - valpy_call, /*tp_call*/ + wrap_tp_call, /*tp_call*/ ... I also made it explicit that the keywords argument is unused. I added wrapper function gdbpy_tuple_check to wrap PyTuple_Check. It always succeeds, so strictly speaking it doesn't need a wrapper, but always using wrapper function and trusting them to DDRT is easier than remembering which functions always succeed. I also added this template: ... template T gdbpy_require_nonnull (T val) { if (val == nullptr) throw gdb_python_exception (); return val; } ... to do this simplification: ... - vargs[i] = convert_value_from_python (item); + vargs[i] = gdbpy_require_nonnull (convert_value_from_python (item)); - if (vargs[i] == NULL) - throw gdb_python_exception (); ... as a placeholder until convert_value_from_python is converted. Tested on x86_64-linux. --- gdb/python/py-safety.h | 9 ++++ gdb/python/py-value.c | 89 +++++++++++++++------------------------- gdb/python/py-wrappers.h | 18 ++++++++ 3 files changed, 61 insertions(+), 55 deletions(-) diff --git a/gdb/python/py-safety.h b/gdb/python/py-safety.h index 3294f38c8b6..56f7ddd3b85 100644 --- a/gdb/python/py-safety.h +++ b/gdb/python/py-safety.h @@ -343,4 +343,13 @@ wrap_setter (PyObject *arg, PyObject *value, void *closure) return 0; } +/* A function that wraps a "tp_call" method. */ +template F (gdbpy_borrowed_ref<>, gdbpy_borrowed_ref<>, + gdbpy_opt_borrowed_ref<>)> +PyObject * +wrap_tp_call (PyObject *self, PyObject *args, PyObject *keywords) +{ + return safety_details::wrapped_function (self, args, keywords); +} + #endif /* GDB_PYTHON_PY_SAFETY_H */ diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c index 5b38110396e..222932a1549 100644 --- a/gdb/python/py-value.c +++ b/gdb/python/py-value.c @@ -1164,43 +1164,32 @@ valpy_setitem (PyObject *self, PyObject *key, PyObject *value) } /* Called by the Python interpreter to perform an inferior function - call on the value. Returns NULL on error, with a python exception set. */ -static PyObject * -valpy_call (PyObject *self, PyObject *args, PyObject *keywords) + call on the value. */ +static gdbpy_ref<> +valpy_call (gdbpy_borrowed_ref<> self, gdbpy_borrowed_ref<> args, + gdbpy_opt_borrowed_ref<> keywords ATTRIBUTE_UNUSED) { Py_ssize_t args_count; - struct value *function = ((value_object *) self)->value; + struct value *function = ((value_object *) (PyObject *)self)->value; struct value **vargs = NULL; struct type *ftype = NULL; gdbpy_ref<> result; - try - { - ftype = check_typedef (function->type ()); - } - catch (const gdb_exception &except) - { - return gdbpy_handle_gdb_exception (nullptr, except); - } + ftype = check_typedef (function->type ()); if (ftype->code () != TYPE_CODE_FUNC && ftype->code () != TYPE_CODE_METHOD && ftype->code () != TYPE_CODE_INTERNAL_FUNCTION) - { - PyErr_SetString (PyExc_RuntimeError, - _("Value is not callable (not TYPE_CODE_FUNC" - " or TYPE_CODE_METHOD" - " or TYPE_CODE_INTERNAL_FUNCTION).")); - return NULL; - } + gdbpy_err_set_string + (PyExc_RuntimeError, + _("Value is not callable (not TYPE_CODE_FUNC or TYPE_CODE_METHOD" + " or TYPE_CODE_INTERNAL_FUNCTION).")); - if (! PyTuple_Check (args)) - { - PyErr_SetString (PyExc_TypeError, - _("Inferior arguments must be provided in a tuple.")); - return NULL; - } + if (! gdbpy_tuple_check (args)) + gdbpy_err_set_string + (PyExc_TypeError, + _("Inferior arguments must be provided in a tuple.")); - args_count = PyTuple_Size (args); + args_count = gdbpy_tuple_size (args); if (args_count > 0) { int i; @@ -1208,39 +1197,29 @@ valpy_call (PyObject *self, PyObject *args, PyObject *keywords) vargs = XALLOCAVEC (struct value *, args_count); for (i = 0; i < args_count; i++) { - PyObject *item = PyTuple_GetItem (args, i); - - if (item == NULL) - return NULL; - - vargs[i] = convert_value_from_python (item); - if (vargs[i] == NULL) - return NULL; + gdbpy_borrowed_ref<> item = gdbpy_tuple_get_item (args, i); + vargs[i] = gdbpy_require_nonnull (convert_value_from_python (item)); } } - try - { - scoped_value_mark free_values; + { + scoped_value_mark free_values; - value *return_value; - if (ftype->code () == TYPE_CODE_INTERNAL_FUNCTION) - return_value = call_internal_function (gdbpy_enter::get_gdbarch (), - current_language, - function, args_count, vargs, - EVAL_NORMAL); - else - return_value - = call_function_by_hand (function, NULL, - gdb::make_array_view (vargs, args_count)); - result = value_to_value_object (return_value); - } - catch (const gdb_exception &except) - { - return gdbpy_handle_gdb_exception (nullptr, except); - } + value *return_value; + if (ftype->code () == TYPE_CODE_INTERNAL_FUNCTION) + return_value = call_internal_function (gdbpy_enter::get_gdbarch (), + current_language, + function, args_count, vargs, + EVAL_NORMAL); + else + return_value + = call_function_by_hand (function, NULL, + gdb::make_array_view (vargs, args_count)); - return result.release (); + result = value_to_value_object (return_value); + } + + return result; } /* Called by the Python interpreter to obtain string representation @@ -2376,7 +2355,7 @@ PyTypeObject value_object_type = { 0, /*tp_as_sequence*/ &value_object_as_mapping, /*tp_as_mapping*/ valpy_hash, /*tp_hash*/ - valpy_call, /*tp_call*/ + wrap_tp_call, /*tp_call*/ valpy_str, /*tp_str*/ 0, /*tp_getattro*/ 0, /*tp_setattro*/ diff --git a/gdb/python/py-wrappers.h b/gdb/python/py-wrappers.h index 6c2b5e4d41e..79cc46fbebf 100644 --- a/gdb/python/py-wrappers.h +++ b/gdb/python/py-wrappers.h @@ -358,4 +358,22 @@ gdbpy_sequence_concat (gdbpy_borrowed_ref<> first, gdbpy_borrowed_ref<> second) return result; } +/* Wrapper for PyTuple_Check. */ +static inline bool +gdbpy_tuple_check (gdbpy_borrowed_ref<> p) +{ + /* Always succeeds. */ + return PyTuple_Check (p); +} + +/* Throw gdb_python_exception if VAL is nullptr. */ +template +T +gdbpy_require_nonnull (T val) +{ + if (val == nullptr) + throw gdb_python_exception (); + return val; +} + #endif /* GDB_PYTHON_PY_WRAPPERS_H */ base-commit: b7f5758529acb1a34dbe025cd3cc593d625e1538 -- 2.51.0