From patchwork Wed May 10 10:20:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Bunt X-Patchwork-Id: 69039 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 E65833857356 for ; Wed, 10 May 2023 10:21:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E65833857356 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683714074; bh=29BMky7QKcH1HSLZimx4+wLYL7HVkechPqp0iBbw+BQ=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=AgAi7cK9fLxnw1DM4UvyR0AqIV3LjkP04vawN1RenwFgYVsSbpEskP2JJh7otwkMp UuvbvYZXkZSfV2OrC/RdpenfaDANVea7jCK8pOp1UnD11YE4g0qAe/+7qYj5L/B3of uvvt0IAxOQOT1yTNF+AAs0yZdyrrCyNMHKaMEH6U= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id 864D43858C66 for ; Wed, 10 May 2023 10:20:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 864D43858C66 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3062b101ae1so4510415f8f.2 for ; Wed, 10 May 2023 03:20:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683714049; x=1686306049; 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=29BMky7QKcH1HSLZimx4+wLYL7HVkechPqp0iBbw+BQ=; b=KjBij6k1BzwLiyxSFfnpsnfFyqSX+zw0aGsDlwBtwo0NCJCxtZIwkd+2SsHaex9OJA Qv7fy5tKZybwpan56qJAf/7PjNE0+AZMMqmrtWjyOVtTqbfoArlBW4yfjNXIgSTCIw8e ft6qSKKWVSMkZIwABBq9B6jXUTm+c+ztQUcZHWbSz4QMFeZml0SP+4zg+axdTfgHBu9c uTHS6a7rL1Q5Xj9eNCovF7Dy8I7peoYa+J8JMjlCYOcEfPrBTSUDGjpkqQQ6/EbaZsjU vCFdPqyJ4uI9AeGqiw9zUcCoddDFmKAVHFm2/MaURvotOLl1d+P4uMWKLZBD3epBLZJf FoIw== X-Gm-Message-State: AC+VfDyNpkTZgy8nYEehaLFBzqhXsdpQ+yc/rWWjV4OpGCy5CGSaWbBE G+7LOIflh6+T4JW+CG4Qhp6cpaNjNDEzvbCd5Sg= X-Google-Smtp-Source: ACHHUZ4Rbqnt9Bop5JGpTyrJU6DOSGIGUarJITnBpUdwSreXEB7NUVsZl8HljpOHD6fK74NYfJ99Dw== X-Received: by 2002:a5d:4c8d:0:b0:307:9721:487e with SMTP id z13-20020a5d4c8d000000b003079721487emr7616978wrs.9.1683714049168; Wed, 10 May 2023 03:20:49 -0700 (PDT) Received: from whitegate.home ([2a00:23c4:9603:7f01:4745:47cb:3cd5:4c6e]) by smtp.gmail.com with ESMTPSA id c17-20020adffb11000000b003075428aad5sm16727389wrr.29.2023.05.10.03.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 03:20:48 -0700 (PDT) To: gdb-patches@sourceware.org Cc: Richard Bunt , Josh Cottingham Subject: [PATCH] gdb/mi: Fix printing of fortran strings in stack Date: Wed, 10 May 2023 11:20:31 +0100 Message-Id: <20230510102031.2125810-1-richard.bunt@linaro.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Spam-Status: No, score=-13.9 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.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Bunt via Gdb-patches From: Richard Bunt Reply-To: Richard Bunt Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" 547ce8f00b4ef826bdc9bf9a74f119fe9768852e fixed an issue where dynamic types were not being resolved correctly prior to printing a value. The same issue was discovered when printing the value using MI-mode. Solved by porting the fix to the MI mode code path. GDB built with GCC 13. No test suite regressions detected. Compilers: GCC 12.1.0, ACfL 22.1, Intel 22.1; Platforms: x86_64, aarch64. Co-Authored-By: Josh Cottingham --- gdb/mi/mi-cmd-stack.c | 3 +++ gdb/testsuite/gdb.fortran/mixed-lang-stack.exp | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index 0172bf9814d..70762880c49 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -590,6 +590,9 @@ list_args_or_locals (const frame_print_options &fp_opts, ui_out_emit_list list_emitter (uiout, name_of_result); + scoped_restore_selected_frame restore_selected_frame; + select_frame (fi); + while (block != 0) { for (struct symbol *sym : block_iterator_range (block)) diff --git a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp index 6ab3f8adeba..5fc36f7b95b 100644 --- a/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp +++ b/gdb/testsuite/gdb.fortran/mixed-lang-stack.exp @@ -92,6 +92,18 @@ proc run_tests { lang } { } } + # Check backtrace arguments in MI mode. + set mi_a "\{name=\"a\",value=\"1\"\}" + set mi_b "\{name=\"b\",value=\"2\"\}" + set mi_c "\{name=\"c\",value=\"3\"\}" + set mi_d "\{name=\"d\",value=\"\\(4,5\\)\"\}" + set mi_e "\{name=\"e\",value=\"$e_arg\"\}" + set mi_g "\{name=\"g\",value=\"\\( a = 1.5, b = 2.5 \\)\"\}" + # Hidden argument name changes depending on compiler. + set mi_hidden "\{name=\"\[^\r\n\]+\",value=\"6\"\}" + gdb_test "interpreter-exec mi '-stack-list-arguments --no-frame-filters --all-values 7 7'" \ + "\\^done,stack-args=\\\[frame=\{level=\"7\",args=\\\[$mi_a,$mi_b,$mi_c,$mi_d,$mi_e,$mi_g,$mi_hidden\\\]\}\\\]" + # Check the language for frame #0. gdb_test "info frame" "source language fortran\..*" \ "info frame in frame #0"