From patchwork Wed Jan 25 15:06:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63678 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 AAAA53858413 for ; Wed, 25 Jan 2023 15:06:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AAAA53858413 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674659201; bh=ooBQk+STYkjEZe0QewO1nf3W9KUUQRWsJ4SC3822jA0=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=cUBlZpsOzHy4LdkPVEtChTFyidOtvl6A9hXUJlXWIbZObor91UAu2stKRq/T4QwMz 1kVr1FfpUyf5Tsm3EmW9UmoOkq6ZReaG7J+0g0QZdgnUU9cmK61zHZrMUXugL5TXe2 HFOXS/o5JyR55F86FX5Xom5k7iTfi5FJ53aCSwrw= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by sourceware.org (Postfix) with ESMTPS id 96EEA3858D28 for ; Wed, 25 Jan 2023 15:06:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 96EEA3858D28 Received: by mail-il1-x134.google.com with SMTP id g15so1162829ild.3 for ; Wed, 25 Jan 2023 07:06:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ooBQk+STYkjEZe0QewO1nf3W9KUUQRWsJ4SC3822jA0=; b=mq9IFRaV9lU6I0khhNag+c70tULg4gnPPcXCzq7AQRXxc093LIkBamGsqOR02+xlhr MvHoEcL1qxct+sg9QGGMRxaWvoD63j7LyKlHsgGT5/MjdbLZfRJ1j7xausxgCqf86WeG VrJFcywvTdzsLNOrEDnXAGJjGmGeV2LqbXK8AZ0Bs6CaH28tzJpFIT+AeWSoVZGWEor1 DeDp+CKx5QmkodOEU0q5MzjH4JY57egLY+Wp103azzc8cUq7YNiabpwSikP78LNV9Ene ciKUZHbc3visRJ/zUljpC2zzNZBtLSATEEi7kb8bIcZPPm7zsVNNrwLLiyu92GbmWDmV oQwA== X-Gm-Message-State: AFqh2kp9KZ8rmup5clURI2jUaLOmmDkZ1zRRjASEWNsLIyquYUFJeQvs 5CGK+OgH5y5aha20iEV+AXuJ6WbFKCOmce93 X-Google-Smtp-Source: AMrXdXvbFPDJ0hi+EFjAyEQed5hELJJ1pVUHrM5Dh1XONY3PS+pUdgfXY7zXVOJ/m0576siIh2YDVg== X-Received: by 2002:a92:bf11:0:b0:30e:ebc6:bae with SMTP id z17-20020a92bf11000000b0030eebc60baemr22533711ilh.22.1674659176784; Wed, 25 Jan 2023 07:06:16 -0800 (PST) Received: from localhost.localdomain (97-122-76-186.hlrn.qwest.net. [97.122.76.186]) by smtp.gmail.com with ESMTPSA id r6-20020a92c5a6000000b0030c68d38255sm1598605ilt.38.2023.01.25.07.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jan 2023 07:06:16 -0800 (PST) To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Clean up unusual code in mi-cmd-stack.c Date: Wed, 25 Jan 2023 08:06:09 -0700 Message-Id: <20230125150609.3987536-1-tromey@adacore.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 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 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" I noticed some unusual code in mi-cmd-stack.c. This code is a switch, where one of the cases appears in the middle of another block. It seemed cleaner to me to have the earlier case just conditionally fall through. --- gdb/mi/mi-cmd-stack.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index 00e61e04b67..4666808a9c9 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -571,7 +571,6 @@ list_args_or_locals (const frame_print_options &fp_opts, const struct block *block; struct symbol *sym; struct block_iterator iter; - struct type *type; const char *name_of_result; struct ui_out *uiout = current_uiout; @@ -649,17 +648,20 @@ list_args_or_locals (const frame_print_options &fp_opts, switch (values) { case PRINT_SIMPLE_VALUES: - type = check_typedef (sym2->type ()); - if (type->code () != TYPE_CODE_ARRAY - && type->code () != TYPE_CODE_STRUCT - && type->code () != TYPE_CODE_UNION) - { + { + struct type *type = check_typedef (sym2->type ()); + if (type->code () == TYPE_CODE_ARRAY + || type->code () == TYPE_CODE_STRUCT + || type->code () == TYPE_CODE_UNION) + break; + } + /* FALLTHROUGH */ + case PRINT_ALL_VALUES: if (sym->is_argument ()) read_frame_arg (fp_opts, sym2, fi, &arg, &entryarg); else read_frame_local (sym2, fi, &arg); - } break; }