From patchwork Sat Mar 2 12:36:53 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: 86699 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 610003858D3C for ; Sat, 2 Mar 2024 12:36:55 +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 [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id D779E3858D1E for ; Sat, 2 Mar 2024 12:36:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D779E3858D1E 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 D779E3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709382994; cv=none; b=rI4FU99DxUPxBTm3oMClFL30jM4TOxxsHanMuaPcwq4TAozl+LXDrnuUO0sULrmk610mUhvTZekVl4yFt01DaNHKemUPkMo2EKS5PueUV2h7sByRwqkTfLY2OEEVig5Sz8wn2qT6GBKAjtL3ES3ZtPFNUS7M2Xn+jwpzWGCCfwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709382994; c=relaxed/simple; bh=D9m092qdI9xHvAXx6DhgwL9I3RdTVYu1/wo3ymbskXs=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=T2TTnpzgy//Cf2NDTRpzPdO/Mw+uhVQQgfJRzoA1l8yYDjnD8iukW2R/aQSaj6dHJkIH1I6vr0MHV+1z15Kda5ZcBz0iSuVVtDbTc9A0VoEF0Pwgp02gK76AOkG+OYySiylVa61pMZXxBwG0k/+Xau9O5N7pFjnlozpUTEmgBCI= 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 BA544376C1 for ; Sat, 2 Mar 2024 12:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709382991; 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=90vEoRnyQPdQz1BmL7+CgJiyOsxl1NOV4elCzioISe4=; b=PjqDfmm7zRQJ0yE3vBmb8dwCpvnPiLI7wj9bdPocQzkLuQfD1plOxbzt4uGSspm0yjKuss BCrlksXGuZYC13XFX4xTqzKMRrAx8H3TTFw+KSPIYAfgXTGTpGeqGdFYxgW8kVX+xtimtC 5PWfCex+uHOkLuiTNik2cNUEUo+oNdM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709382991; 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=90vEoRnyQPdQz1BmL7+CgJiyOsxl1NOV4elCzioISe4=; b=Y76hO8G5pP4KBAyjAxkORgVFF3vssYCTWaa7qUozNBHtet0Nu2uMxreeMFd2fXQ8B/QX65 CWCRmQTJN6nYuuDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1709382991; 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=90vEoRnyQPdQz1BmL7+CgJiyOsxl1NOV4elCzioISe4=; b=PjqDfmm7zRQJ0yE3vBmb8dwCpvnPiLI7wj9bdPocQzkLuQfD1plOxbzt4uGSspm0yjKuss BCrlksXGuZYC13XFX4xTqzKMRrAx8H3TTFw+KSPIYAfgXTGTpGeqGdFYxgW8kVX+xtimtC 5PWfCex+uHOkLuiTNik2cNUEUo+oNdM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1709382991; 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=90vEoRnyQPdQz1BmL7+CgJiyOsxl1NOV4elCzioISe4=; b=Y76hO8G5pP4KBAyjAxkORgVFF3vssYCTWaa7qUozNBHtet0Nu2uMxreeMFd2fXQ8B/QX65 CWCRmQTJN6nYuuDA== 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 970951379D for ; Sat, 2 Mar 2024 12:36:31 +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 gpAOI08d42UQIQAAD6G6ig (envelope-from ) for ; Sat, 02 Mar 2024 12:36:31 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/python] Make gdb.UnwindInfo.add_saved_register more robust Date: Sat, 2 Mar 2024 13:36:53 +0100 Message-Id: <20240302123653.16923-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Authentication-Results: smtp-out1.suse.de; none X-Spam-Score: 3.56 X-Spamd-Result: default: False [3.56 / 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.19)[-0.965]; 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.15)[68.68%] 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 On arm-linux, until commit bbb12eb9c84 ("gdb/arm: Remove tpidruro register from non-FreeBSD target descriptions") I ran into: ... FAIL: gdb.base/inline-frame-cycle-unwind.exp: cycle at level 5: \ backtrace when the unwind is broken at frame 5 ... What happens is the following: - the TestUnwinder from inline-frame-cycle-unwind.py calls gdb.UnwindInfo.add_saved_register with reg == tpidruro and value "", - pyuw_sniffer calls value->contents ().data () to access the value of the register, which throws an UNAVAILABLE_ERROR, - this causes the TestUnwinder unwinder to fail, after which another unwinder succeeds and returns the correct frame, and - the test-case fails because it's counting on the TestUnwinder to succeed and return an incorrect frame. Fix this by checking for !value::entirely_available as well as valued::optimized_out in unwind_infopy_add_saved_register. Tested on x86_64-linux and arm-linux. PR python/31437 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31437 --- gdb/python/py-unwind.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) base-commit: a6a3b67fa9052bba81ed91a38569c11ecb95baf1 diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c index 56f925bc57f..1c1289f7e7d 100644 --- a/gdb/python/py-unwind.c +++ b/gdb/python/py-unwind.c @@ -362,6 +362,18 @@ unwind_infopy_add_saved_register (PyObject *self, PyObject *args, PyObject *kw) return nullptr; } + if (value->optimized_out () || !value->entirely_available ()) + { + /* If we allow this value to be registered here, pyuw_sniffer is going + to run into an exception when trying to access its contents. + Throwing an exception here just puts a burden on the user to + implement the same checks on the user side. We could return False + here and True otherwise, but again that might require changes in user + code. So, handle this with minimal impact for the user, while + improving robustness: silently ignore the register/value pair. */ + Py_RETURN_NONE; + } + gdbpy_ref<> new_value = gdbpy_ref<>::new_reference (pyo_reg_value); bool found = false; for (saved_reg ® : *unwind_info->saved_regs)