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; From patchwork Fri Mar 8 15:29:37 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: 86983 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 E08C2385DC3E for ; Fri, 8 Mar 2024 16:17:31 +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 [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id B0F473858D38 for ; Fri, 8 Mar 2024 16:17:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B0F473858D38 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 B0F473858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709914629; cv=none; b=WY3zV9t/09IbrxLRt0SQ+7VnN03MDjKMOugOX89z0iJ2865mhpPtzYWWWXuI70mt0Lw9nJ6AJTV6K8vRX0hMhxolyTMTv3hl59xgAITuUTLPomlmqiS6qHOp/EV3iMNInfoy1T8iNxZn0IeICXLPMZD1Y6ZaV18UYGlC9tBvFQE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709914629; c=relaxed/simple; bh=OWMRYeK5xMVWnBDOO3gnlQfh1+2WNkM4ns6bojO/FvI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=Pw3c05DR9vEP2SJ6rGJLKEVPCEuLrwBZXG4pYMqy3vSL8YqDoxCpB7LDHM6zTxUikAc1DKjVAdVPaShGF1xzMAETP7eejvIB29ouyXKkSCwke8GzShYrwPZMmmBzXh/H98ArF3ZxEUgvTwNM5IF14h7QsArPdAlTev+80fTwCzw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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 D729660B22 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: in-reply-to:in-reply-to:references:references; bh=Qrs4iIZnWhi8RWDZBYQNL4Hszm4zFpn3q1BpC4syihw=; b=uNR1gvKV5NwcwP9Hrzh0LaLS1Py0AE7dTXBsiMl3qe0QST3ngbGAiJQ0KVDPriCddPTj4G /Rhe8JebVaXdkn/MbLiQzAzttejj3glCGryshA2xLJLn1vqj01VuiyVJgUamdoXDd3wcij kFC9CpnbHviTE4vYNi42iXbS+Rnmdl8= 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: in-reply-to:in-reply-to:references:references; bh=Qrs4iIZnWhi8RWDZBYQNL4Hszm4zFpn3q1BpC4syihw=; b=fEQ4BRm0GrlmFEDTms8kD3PS0wxVa8ovvUUejtwj0GEyqnKb38w2CEsxRjgGjCQ906tAsP ZkBp2fhdXIE/b+AA== 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: in-reply-to:in-reply-to:references:references; bh=Qrs4iIZnWhi8RWDZBYQNL4Hszm4zFpn3q1BpC4syihw=; b=uNR1gvKV5NwcwP9Hrzh0LaLS1Py0AE7dTXBsiMl3qe0QST3ngbGAiJQ0KVDPriCddPTj4G /Rhe8JebVaXdkn/MbLiQzAzttejj3glCGryshA2xLJLn1vqj01VuiyVJgUamdoXDd3wcij kFC9CpnbHviTE4vYNi42iXbS+Rnmdl8= 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: in-reply-to:in-reply-to:references:references; bh=Qrs4iIZnWhi8RWDZBYQNL4Hszm4zFpn3q1BpC4syihw=; b=fEQ4BRm0GrlmFEDTms8kD3PS0wxVa8ovvUUejtwj0GEyqnKb38w2CEsxRjgGjCQ906tAsP ZkBp2fhdXIE/b+AA== 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 C16D613786 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 IITdLbwu62USQwAAD6G6ig (envelope-from ) for ; Fri, 08 Mar 2024 15:29:00 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 2/3] [gdb/python] Normalize exceptions in gdbpy_err_fetch Date: Fri, 8 Mar 2024 16:29:37 +0100 Message-Id: <20240308152938.18166-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240308152938.18166-1-tdevries@suse.de> References: <20240308152938.18166-1-tdevries@suse.de> MIME-Version: 1.0 Authentication-Results: smtp-out2.suse.de; none X-Spam-Score: 3.69 X-Spamd-Result: default: False [3.69 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.01)[51.49%] 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 With python 3.12, I run into: ... (gdb) PASS: gdb.python/py-block.exp: check variable access python print (block['nonexistent'])^M Python Exception : 'nonexistent'^M Error occurred in Python: 'nonexistent'^M (gdb) FAIL: gdb.python/py-block.exp: check nonexistent variable ... The problem is that that PyErr_Fetch returns a normalized exception, while the test-case matches the output for an unnormalized exception. With python 3.6, PyErr_Fetch returns an unnormalized exception, and the test passes. Fix this by: - updating the test-case to match the output for a normalized exception, and - lazily forcing normalized exceptions using PyErr_NormalizeException. Tested on aarch64-linux. --- gdb/python/python-internal.h | 15 ++++++++++++++- gdb/testsuite/gdb.python/py-block.exp | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 9ceb4aa7ed4..30802ae2480 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -683,6 +683,18 @@ class gdbpy_err_fetch gdbpy_ref<> value () const { + if (!m_normalized) + { + PyObject *error_type, *error_value, *error_traceback; + error_type = m_error_type.release (); + error_value = m_error_value.release (); + error_traceback = m_error_traceback.release (); + PyErr_NormalizeException (&error_type, &error_value, &error_traceback); + m_error_type.reset (error_type); + m_error_value.reset (error_value); + m_error_traceback.reset (error_traceback); + m_normalized = true; + } return m_error_value; } @@ -695,7 +707,8 @@ class gdbpy_err_fetch private: - gdbpy_ref<> m_error_type, m_error_value, m_error_traceback; + mutable gdbpy_ref<> m_error_type, m_error_value, m_error_traceback; + mutable bool m_normalized = false; }; /* Called before entering the Python interpreter to install the diff --git a/gdb/testsuite/gdb.python/py-block.exp b/gdb/testsuite/gdb.python/py-block.exp index 942611af305..99642a546a7 100644 --- a/gdb/testsuite/gdb.python/py-block.exp +++ b/gdb/testsuite/gdb.python/py-block.exp @@ -44,7 +44,7 @@ gdb_test "python print (block.function)" "None" "first anonymous block" gdb_test "python print (block.start)" "${decimal}" "check start not None" gdb_test "python print (block.end)" "${decimal}" "check end not None" gdb_test "python print (block\['f'\].name == 'f')" "True" "check variable access" -gdb_test "python print (block\['nonexistent'\])" ".*KeyError.*: nonexistent.*" \ +gdb_test "python print (block\['nonexistent'\])" ".*KeyError.*: 'nonexistent'.*" \ "check nonexistent variable" gdb_test "python print (block\[42\])" ".*TypeError.*: Expected a string.*" \ "check non-string key" From patchwork Fri Mar 8 15:29:38 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: 86990 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 1388A385E000 for ; Fri, 8 Mar 2024 18:07:36 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org 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 22A483858D33 for ; Fri, 8 Mar 2024 18:07:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 22A483858D33 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 22A483858D33 Authentication-Results: server2.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=1709921233; cv=none; b=x3pBU/owmOZ5ZqGmwZ63qXNZX2/wdDZt/aodyZ9ooX6ArtGkpecSQH3TIQqvGBkeryVuGonVcgA7c8I47HYhdP/rMbmjSJTOf55b2O/3+xzomG857x8TCRWnOwEpQE9d8sTdlVMVU7QSO0qgg0uXdRSy2M6K5agVuTfcQUlCq7o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709921233; c=relaxed/simple; bh=Radj2+9PbbLhFKKbA4o7UgeaRk5694bnn9dEu+3P2QI=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=YF4O2Mbl9TKufXWc68Ecx575c6qwTqlf3amQO3/gOTD4i84YQYg+Z97EkzPP7Xe358Jre5xuuFA7NoH3LKrzSB839iDmlrbMKyB0nVdDWRGBShh6KiubR2tvA8IXBnazbsLUkNbb7vQPX7ogFsD+PCN0Ob5og74e2qJ8VJTOROw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [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 0360E37E50 for ; Fri, 8 Mar 2024 15:29:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709911741; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vNH8M//JQOgztErvWEUCQfwNQdlzGynuh7ZLMZi423g=; b=d2ZfJuWHoPZmecnrFErGL1Z0FnD6pPK6OJXMaeQ/s4c98C+/w8f/etnK6/WHzAmLFBZOxe cwuurrvOrmcqi7K7zUm0BlAEJhB9zXvEBzVD0aRYeJwP7xk5oaqcNYA3SY/2+Fnllc8ABQ 8ZeT6qr8JCq2eqTEThbyxtCX1D9QDIg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709911741; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vNH8M//JQOgztErvWEUCQfwNQdlzGynuh7ZLMZi423g=; b=eEvprI9bRXYL3i0fAYh9DrKsuet9Xb3otMg9g6HnQFUl0b019tlcze2h+5LuuXLq7myaXt nYdIFqixFDuUAwDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709911741; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vNH8M//JQOgztErvWEUCQfwNQdlzGynuh7ZLMZi423g=; b=d2ZfJuWHoPZmecnrFErGL1Z0FnD6pPK6OJXMaeQ/s4c98C+/w8f/etnK6/WHzAmLFBZOxe cwuurrvOrmcqi7K7zUm0BlAEJhB9zXvEBzVD0aRYeJwP7xk5oaqcNYA3SY/2+Fnllc8ABQ 8ZeT6qr8JCq2eqTEThbyxtCX1D9QDIg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709911741; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vNH8M//JQOgztErvWEUCQfwNQdlzGynuh7ZLMZi423g=; b=eEvprI9bRXYL3i0fAYh9DrKsuet9Xb3otMg9g6HnQFUl0b019tlcze2h+5LuuXLq7myaXt nYdIFqixFDuUAwDQ== 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 DE2A1133DC 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 0KzfNLwu62USQwAAD6G6ig (envelope-from ) for ; Fri, 08 Mar 2024 15:29:00 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH v2 3/3] [gdb/python] Handle deprecation of PyErr_{Fetch, Restore} in 3.12 Date: Fri, 8 Mar 2024 16:29:38 +0100 Message-Id: <20240308152938.18166-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240308152938.18166-1-tdevries@suse.de> References: <20240308152938.18166-1-tdevries@suse.de> MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spamd-Result: default: False [4.90 / 50.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; R_MISSING_CHARSET(2.50)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; BROKEN_CONTENT_TYPE(1.50)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MID_CONTAINS_FROM(1.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-0.00)[41.17%] X-Spam-Score: 4.90 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 Starting python version 3.12, PyErr_Fetch and PyErr_Restore are deprecated. Use PyErr_GetRaisedException and PyErr_SetRaisedException instead, for python >= 3.12. Tested on aarch64-linux. --- gdb/python/python-internal.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h index 30802ae2480..d603b3a1b85 100644 --- a/gdb/python/python-internal.h +++ b/gdb/python/python-internal.h @@ -640,12 +640,18 @@ class gdbpy_err_fetch gdbpy_err_fetch () { +#if PY_VERSION_HEX < 0x030c0000 PyObject *error_type, *error_value, *error_traceback; PyErr_Fetch (&error_type, &error_value, &error_traceback); m_error_type.reset (error_type); m_error_value.reset (error_value); m_error_traceback.reset (error_traceback); +#else + /* PyErr_Fetch is deprecated in python 3.12, use PyErr_GetRaisedException + instead. */ + m_exc.reset (PyErr_GetRaisedException ()); +#endif } /* Call PyErr_Restore using the values stashed in this object. @@ -654,9 +660,15 @@ class gdbpy_err_fetch void restore () { +#if PY_VERSION_HEX < 0x030c0000 PyErr_Restore (m_error_type.release (), m_error_value.release (), m_error_traceback.release ()); +#else + /* PyErr_Restore is deprecated in python 3.12, use PyErr_SetRaisedException + instead. */ + PyErr_SetRaisedException (m_exc.release ()); +#endif } /* Return the string representation of the exception represented by @@ -683,6 +695,7 @@ class gdbpy_err_fetch gdbpy_ref<> value () const { +#if PY_VERSION_HEX < 0x030c0000 if (!m_normalized) { PyObject *error_type, *error_value, *error_traceback; @@ -696,19 +709,32 @@ class gdbpy_err_fetch m_normalized = true; } return m_error_value; +#else + return m_exc; +#endif } /* Return a new reference to the exception type object. */ gdbpy_ref<> type () const { +#if PY_VERSION_HEX < 0x030c0000 return m_error_type; +#else + if (m_exc.get() == nullptr) + return nullptr; + return gdbpy_ref<>::new_reference ((PyObject *)Py_TYPE (m_exc.get ())); +#endif } private: +#if PY_VERSION_HEX < 0x030c0000 mutable gdbpy_ref<> m_error_type, m_error_value, m_error_traceback; mutable bool m_normalized = false; +#else + gdbpy_ref<> m_exc; +#endif }; /* Called before entering the Python interpreter to install the