From patchwork Fri Mar 8 15:29:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 86982 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 4C9FC385E008 for ; Fri, 8 Mar 2024 16:11:10 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 30623385E002 for ; Fri, 8 Mar 2024 16:10:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 30623385E002 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 30623385E002 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709914246; cv=none; b=WgAvxOLjXQoD3upOlphZVSXzErWGHAdGLvq+n7b4NXi/qs3Y1NMm3ZDsUtoyyra6IBrFvBG84nYMxLzmyt4mT4A0ODFGc/IJWKUoQ4K4SXXQd4P2zgM3Ci3X2V4FBSpWfJ7a47IXMOkyk3TsS9K2rBORYAYSO9fTq6vs+TrQc3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709914246; c=relaxed/simple; bh=h3Jg6A1IOFkuSNXkjvnpDp/ndHm4tcmeKLqjS1WBuJM=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=hNploxGhJN/Uwn/NUq/i+Jydg9FJG4RTe40wbhNwQ3Uj1KBhGu5lC79nCAPQzQx5xvVWyNfmm/mx/eQoSalkIUoHrWDF/xlLSyssMcHYXEe1/6xMB73RV6hd4HlQjxjx+xQirytPCElQobPnqJx98KpaOgdENcnk3MgKboE4gaE= ARC-Authentication-Results: i=1; server2.sourceware.org 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-out2.suse.de (Postfix) with ESMTPS id BA51C207EE for ; Fri, 8 Mar 2024 15:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709911740; 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=WQlG+dtgVUcmSl5pQJEsjh2CRkKvuVqroIdvZ5GwUM4=; b=AgFQJ315lEoCc30S6GuNALgB6o7v9TlmkMrkzl40s0lrF1WU6m48SmnU2jLoG8YAPZcAZl dPCOUEF9jfoXa6r0bWUrMdlPU6wXz4yoYco5vi9b9Ah3TQY6wlcsM5Bm2bNiAn/vfYub+U fTQqdUSW9qbJgdy+rQD/fSfaYqYUNDU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709911740; 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=WQlG+dtgVUcmSl5pQJEsjh2CRkKvuVqroIdvZ5GwUM4=; b=VxG2yDuWO0J+wxRETzjpzwC2xVhGoeyEeNVjHMr6jQwpu2nKrOCebOeRIZPnh8HwGwiqHX N5fHhzFmsjEhFrAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709911740; 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=WQlG+dtgVUcmSl5pQJEsjh2CRkKvuVqroIdvZ5GwUM4=; b=AgFQJ315lEoCc30S6GuNALgB6o7v9TlmkMrkzl40s0lrF1WU6m48SmnU2jLoG8YAPZcAZl dPCOUEF9jfoXa6r0bWUrMdlPU6wXz4yoYco5vi9b9Ah3TQY6wlcsM5Bm2bNiAn/vfYub+U fTQqdUSW9qbJgdy+rQD/fSfaYqYUNDU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709911740; 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=WQlG+dtgVUcmSl5pQJEsjh2CRkKvuVqroIdvZ5GwUM4=; b=VxG2yDuWO0J+wxRETzjpzwC2xVhGoeyEeNVjHMr6jQwpu2nKrOCebOeRIZPnh8HwGwiqHX N5fHhzFmsjEhFrAg== 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 A5030133DC for ; Fri, 8 Mar 2024 15:29:00 +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 3pHjJrwu62USQwAAD6G6ig (envelope-from ) for ; Fri, 08 Mar 2024 15:29:00 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 1/3] [gdb/python] Use gdbpy_err_fetch::{type, value} as getters Date: Fri, 8 Mar 2024 16:29:36 +0100 Message-Id: <20240308152938.18166-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Level: X-Spamd-Bar: / Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=AgFQJ315; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=VxG2yDuW X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [0.62 / 50.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; R_MISSING_CHARSET(2.50)[]; TO_DN_NONE(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[suse.de:+]; MX_GOOD(-0.01)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-0.87)[85.68%]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[suse.de:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCPT_COUNT_ONE(0.00)[1]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: 0.62 X-Rspamd-Queue-Id: BA51C207EE X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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 Similar to gdbpy_err_fetch::value, add a getter gdbpy_err_fetch::type, and use both consistently to get gdbpy_err_fetch members m_error_value and m_error_type. Tested on aarch64-linux. --- gdb/python/py-utils.c | 8 ++++---- gdb/python/python-internal.h | 12 ++++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) base-commit: cdabd12b186e8e794045372b753416a18c387d7b diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c index 9382eb62a5f..4fbdb695a50 100644 --- a/gdb/python/py-utils.c +++ b/gdb/python/py-utils.c @@ -195,10 +195,10 @@ gdbpy_err_fetch::to_string () const Using str (aka PyObject_Str) will fetch the error message from gdb.GdbError ("message"). */ - if (m_error_value.get () != nullptr && m_error_value.get () != Py_None) - return gdbpy_obj_to_string (m_error_value.get ()); + if (this->value ().get () != nullptr && this->value ().get () != Py_None) + return gdbpy_obj_to_string (this->value ().get ()); else - return gdbpy_obj_to_string (m_error_type.get ()); + return gdbpy_obj_to_string (this->type ().get ()); } /* See python-internal.h. */ @@ -206,7 +206,7 @@ gdbpy_err_fetch::to_string () const gdb::unique_xmalloc_ptr gdbpy_err_fetch::type_to_string () const { - return gdbpy_obj_to_string (m_error_type.get ()); + return gdbpy_obj_to_string (this->type ().get ()); } /* Convert a GDB exception to the appropriate Python exception. diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index c68aff5340e..9ceb4aa7ed4 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -675,16 +675,24 @@ class gdbpy_err_fetch bool type_matches (PyObject *type) const { - return PyErr_GivenExceptionMatches (m_error_type.get (), type); + gdbpy_ref<> err_type = this->type (); + return PyErr_GivenExceptionMatches (err_type.get (), type); } /* Return a new reference to the exception value object. */ - gdbpy_ref<> value () + gdbpy_ref<> value () const { return m_error_value; } + /* Return a new reference to the exception type object. */ + + gdbpy_ref<> type () const + { + return m_error_type; + } + private: gdbpy_ref<> m_error_type, m_error_value, m_error_traceback;