From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id DKcdNxnLoWmmuQwAWB0awg (envelope-from ) for ; Fri, 27 Feb 2026 11:49:29 -0500 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=pAicXZOs; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id CA1CD1E089; Fri, 27 Feb 2026 11:49:29 -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.1 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,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 A26061E089 for ; Fri, 27 Feb 2026 11:49:28 -0500 (EST) Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 1F1CE4B9DB4D for ; Fri, 27 Feb 2026 16:49:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1F1CE4B9DB4D Authentication-Results: sourceware.org; dkim=fail reason="signature verification failed" (768-bit key, unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=pAicXZOs Received: from omta34.uswest2.a.cloudfilter.net (omta34.uswest2.a.cloudfilter.net [35.89.44.33]) by sourceware.org (Postfix) with ESMTPS id 5134D4BA2E14 for ; Fri, 27 Feb 2026 16:48:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5134D4BA2E14 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 5134D4BA2E14 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.33 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772210935; cv=none; b=O7hz/ujt8bMOl8X5xocgAROiU63qSdDbf0mL0NT4PNiMYwELZkb1KkKNZhwkd0IAp74Vmqb4xpLcJYLGQvpdDR7W2xSe4KJZa/QA7T6zylR3XXAmjd3p+MKUjo0zaZA3EMBmbxlvTdaohD9tp6v40e0xmSJzA7pnhWXsW6jLvNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1772210935; c=relaxed/simple; bh=0xTSZLEOBulf6SVa6f/Rb1PlvUCBmtOgMY0m9iaEZjg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=LzhkmNOpV8YtExEMQav8/iBtACgkJdXbMwfHCO1rTkJzdLWynfHt8HLLlrs1L863nz6IecYoF87fyQg8TOIVk1yh+a0Dt/xHe6eWK51ndQD12ZDyYQSUDj7KkxgYPRYR7oNXOsV8Bjz6Y1qyYW8uTNWX7lp9lD+cYhu67CIN3wg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5134D4BA2E14 Received: from eig-obgw-5007b.ext.cloudfilter.net ([10.0.29.167]) by cmsmtp with ESMTPS id vudlvvb7dKjfow11Kv0p39; Fri, 27 Feb 2026 16:48:54 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id w11IvMuwaV6WMw11IvMpHn; Fri, 27 Feb 2026 16:48:52 +0000 X-Authority-Analysis: v=2.4 cv=E//Npbdl c=1 sm=1 tr=0 ts=69a1caf5 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=HzLeVaNsDn8A:10 a=ItBw4LHWJt0A:10 a=nbJcvT0ONopVU28pVkkA:9 a=DCx65vhANUyCzuf5D8fC:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=g+vOqbcAr5soZPK+sGL0mMHgMtJAcxSIBqgmvMOSbho=; b=pAicXZOsSxOr6xRTPM4nCV7nql 6YE2zcs1gBLT15lqKGPml/OIBilb1lf0CRe9CGmMLr3I/1ympdUswDnTEBwFHB/SEmsZ8IvjmWxsl ImNP/y2OdmJJfQLxi2IOC+1Dr; Received: from 97-122-122-234.hlrn.qwest.net ([97.122.122.234]:58186 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1vw11H-000000040Sc-3gY4; Fri, 27 Feb 2026 09:48:51 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Use the "O!" format more in the Python code Date: Fri, 27 Feb 2026 09:48:43 -0700 Message-ID: <20260227164843.2275912-1-tom@tromey.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.122.234 X-Source-L: No X-Exim-ID: 1vw11H-000000040Sc-3gY4 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-122-234.hlrn.qwest.net (localhost.localdomain) [97.122.122.234]:58186 X-Source-Auth: tom+tromey.com X-Email-Count: 6 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfJRowmSOPiQpmO/FVi+RLETuTu2RsZcd7MQUH94rBbyYFs6z7QYM+WNZ9OJoPGEuCKIoQiDcgw4vor/mYSa6RZYVJJ+nWKZd+N9OgcOZ4xIzwDP53e4n 4gYeLFHnegfSCS7oryfbo11PN7jiNCRNEA1laU2NI4V+qtQAIOVT5dkJs4lSDtEaIz4ijpAf2opD18YD9By2eCjZ942nV5GTbWQ= 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 I noticed a few spots in the Python code that were decoding method arguments and then immediately type-checking an argument. This can be done more concisely using the "O!" format. --- gdb/python/py-disasm.c | 11 ++--------- gdb/python/py-prettyprint.c | 11 ++++------- gdb/python/py-record-btrace.c | 4 +--- gdb/python/py-symbol.c | 8 +------- 4 files changed, 8 insertions(+), 26 deletions(-) diff --git a/gdb/python/py-disasm.c b/gdb/python/py-disasm.c index 748ffd5e6a3..7635e45db56 100644 --- a/gdb/python/py-disasm.c +++ b/gdb/python/py-disasm.c @@ -620,17 +620,10 @@ disasmpy_set_enabled (PyObject *self, PyObject *args, PyObject *kw) { PyObject *newstate; static const char *keywords[] = { "state", nullptr }; - if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "O", keywords, - &newstate)) + if (!gdb_PyArg_ParseTupleAndKeywords (args, kw, "O!", keywords, + &PyBool_Type, &newstate)) return nullptr; - if (!PyBool_Check (newstate)) - { - PyErr_SetString (PyExc_TypeError, - _("The value passed to `_set_enabled' must be a boolean.")); - return nullptr; - } - python_print_insn_enabled = newstate == Py_True; Py_RETURN_NONE; } diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c index 0aa11d29094..eb7ac2c048f 100644 --- a/gdb/python/py-prettyprint.c +++ b/gdb/python/py-prettyprint.c @@ -679,15 +679,12 @@ gdbpy_default_visualizer (PyObject *self, PyObject *args) PyObject *val_obj; struct value *value; - if (! PyArg_ParseTuple (args, "O", &val_obj)) + if (! PyArg_ParseTuple (args, "O!", &value_object_type, &val_obj)) return NULL; value = value_object_to_value (val_obj); - if (! value) - { - PyErr_SetString (PyExc_TypeError, - _("Argument must be a gdb.Value.")); - return NULL; - } + /* This was ensured by the type-checking during argument + parsing. */ + gdb_assert (value != nullptr); return find_pretty_printer (val_obj).release (); } diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c index 1974dd3e939..6026de91e67 100644 --- a/gdb/python/py-record-btrace.c +++ b/gdb/python/py-record-btrace.c @@ -922,11 +922,9 @@ recpy_bt_goto (PyObject *self, PyObject *args) if (tinfo == NULL || btrace_is_empty (tinfo)) return PyErr_Format (gdbpy_gdb_error, _("Empty branch trace.")); - if (!PyArg_ParseTuple (args, "O", &parse_obj)) + if (!PyArg_ParseTuple (args, "O!", &recpy_insn_type, &parse_obj)) return NULL; - if (Py_TYPE (parse_obj) != &recpy_insn_type) - return PyErr_Format (PyExc_TypeError, _("Argument must be instruction.")); obj = (const recpy_element_object *) parse_obj; try diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c index e8ff2dfe28a..15fcbeea9be 100644 --- a/gdb/python/py-symbol.c +++ b/gdb/python/py-symbol.c @@ -266,15 +266,9 @@ sympy_value (PyObject *self, PyObject *args) frame_info_ptr frame_info = NULL; PyObject *frame_obj = NULL; - if (!PyArg_ParseTuple (args, "|O", &frame_obj)) + if (!PyArg_ParseTuple (args, "|O!", &frame_object_type, &frame_obj)) return NULL; - if (frame_obj != NULL && !PyObject_TypeCheck (frame_obj, &frame_object_type)) - { - PyErr_SetString (PyExc_TypeError, "argument is not a frame"); - return NULL; - } - SYMPY_REQUIRE_VALID (self, symbol); if (symbol->loc_class () == LOC_TYPEDEF) { -- 2.49.0