From patchwork Tue Mar 19 17:33:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87374 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 651BD38582A2 for ; Tue, 19 Mar 2024 17:35:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2d.google.com (mail-io1-xd2d.google.com [IPv6:2607:f8b0:4864:20::d2d]) by sourceware.org (Postfix) with ESMTPS id ED1713858C31 for ; Tue, 19 Mar 2024 17:33:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org ED1713858C31 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org ED1713858C31 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869622; cv=none; b=F6hRICgIVYSBBQh+C3A2Sem2UvaRSPr3lTMZrjHZsT9SQHfCS1isdljVjQ6rPwf00Eq8O8hwaDF8Gs40NcPqn/aobLRxcyMHvVTJ0gK4nnCdxVSu3skYHSNsN6qRNRpaAGmdMglKuK6gjHgb5LRkQXw7GkTN5bdrr/TWf1PLGIU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710869622; c=relaxed/simple; bh=bEdPFONeWWaugJs6+iM+VEr5Arh7U59x32BmfMj7dx0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=pJeKFV9O8dxXVTUbhgpnP0eexGTcOy/59TiZ6ZQzxUaFwd7kOPo1m+khB/b1l/GOTsR5A20QBwRfpByPtdNatu/8Z/rqhChMCA8DXDyX2V3xiJ29futMNJWVJ9fUjHoBJ8+OaUxoxB2DNuBeL86Lo0oMwdrPxOj18XBVuyJRlhY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-7c8ae457b27so124817339f.2 for ; Tue, 19 Mar 2024 10:33:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1710869612; x=1711474412; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=sESN5vi0JqrHRPQBC/eTfZUQWqr+YlMbIgn+Vd5Ulm0=; b=C9haNt+rCyhaqQO0anHkvoxuQhHjqGe9dOIq8+Za4jld2YuJobksTGKFHt2p7HkKuu SQFwDsdFd0mF+PgwNtMSM20rnOfOt6CcuQ6LAKVZxK2sfQXYGY1lHlr3EhRLI2u94AyY Fqptyb5jC6qQQj/SmY+/qdEAsrIjrP0CgNrC9S5On+Njf75U74zt7UBKhky8Y+Gx9tfo NLo+/ofZjw2RZ5u2zQpYOMaIfetSNqssVdi/pA3bWB/yHfuDJEecHhmE5ckTHhiuKGGp Jq7MSAf/3cs58te7oNT6ocmggzWlMLVWjGafcuSk1uo7Piw5iJB65jFGPR81CtmQhVuh 2PBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710869612; x=1711474412; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sESN5vi0JqrHRPQBC/eTfZUQWqr+YlMbIgn+Vd5Ulm0=; b=cO8O0+WEi/vyZtBxx5a4z/zhZgPvGFdtAaz43IjivtTYfq5cn8zu9YzWombXEXeOXq ntk2vb/2XG88oK23qn/+YwRtFfvsZr+Oh5nKPwUy9wJumaig6qmwKGWGAyboVHN1EfB/ 9TQBzYEkB6bHD+ZAtsgWCm3pG7qCYuUbcr9nIgU2511p9EML0fELwpdIt38vhc1VQ488 p8JkfdNsLNXaZXzFtX8gzcpXFtMkJ81bU/h9e0uSR0prP6aNSzfFd6u2x2KKcDcXJzg9 04/4ngalXDW/QycAA2Y4cDLTbKYfIFIDiJ3IMdr5wjrRHbX6TL2bwlN4SS+p0CPm7idi mzuA== X-Gm-Message-State: AOJu0YzLyEaWZXEx5Ocx4CJS0S5fqwQNawtlOdH8FgY+V4tQGfVwEwgV I7uvZ5ouVI+qKbhb1wAn56u43WFyiXcqoSlqUc+goMXmgfzv8gpP2pxQdTYKWiQk2G25RtLu4bY = X-Google-Smtp-Source: AGHT+IFomdYk1mMTFlNW5QKJ2mzL+BxgRH4mtkW3Hchi8UG9ATCRIis5Fg8f44vUnevIrNclvTYLqA== X-Received: by 2002:a5e:9241:0:b0:7cf:727:6b00 with SMTP id z1-20020a5e9241000000b007cf07276b00mr1823084iop.8.1710869612213; Tue, 19 Mar 2024 10:33:32 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id z14-20020a6b650e000000b007cbf1b72c64sm2561310iob.26.2024.03.19.10.33.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Mar 2024 10:33:32 -0700 (PDT) From: Tom Tromey Date: Tue, 19 Mar 2024 11:33:33 -0600 Subject: [PATCH 5/9] Remove bare "except" from disassembler.py MIME-Version: 1.0 Message-Id: <20240319-more-flake8-v1-5-893549dbed75@adacore.com> References: <20240319-more-flake8-v1-0-893549dbed75@adacore.com> In-Reply-To: <20240319-more-flake8-v1-0-893549dbed75@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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 flake8 complains about a bare "except" in disassembler.py. In this case, the code purports to guard against some kind of user error involving data structure corruption. I think it's better here to just let the error occur -- py-disasm.c will show a stack trace in this case. --- gdb/python/lib/gdb/disassembler.py | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/gdb/python/lib/gdb/disassembler.py b/gdb/python/lib/gdb/disassembler.py index ecf42688ae9..2d313ae2122 100644 --- a/gdb/python/lib/gdb/disassembler.py +++ b/gdb/python/lib/gdb/disassembler.py @@ -93,21 +93,14 @@ def _print_insn(info): disassembled.""" def lookup_disassembler(arch): - try: - name = arch.name() - if name is None: - return None - if name in _disassemblers_dict: - return _disassemblers_dict[name] - if None in _disassemblers_dict: - return _disassemblers_dict[None] - return None - except: - # It's pretty unlikely this exception case will ever - # trigger, one situation would be if the user somehow - # corrupted the _disassemblers_dict variable such that it - # was no longer a dictionary. + name = arch.name() + if name is None: return None + if name in _disassemblers_dict: + return _disassemblers_dict[name] + if None in _disassemblers_dict: + return _disassemblers_dict[None] + return None disassembler = lookup_disassembler(info.architecture) if disassembler is None: