From patchwork Mon Feb 19 12:52:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Roirand X-Patchwork-Id: 25965 Received: (qmail 122854 invoked by alias); 19 Feb 2018 12:52:58 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 122845 invoked by uid 89); 19 Feb 2018 12:52:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=H*r:TLS1, 2686 X-HELO: mail-wr0-f174.google.com Received: from mail-wr0-f174.google.com (HELO mail-wr0-f174.google.com) (209.85.128.174) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 19 Feb 2018 12:52:55 +0000 Received: by mail-wr0-f174.google.com with SMTP id u15so9528884wrg.3 for ; Mon, 19 Feb 2018 04:52:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YnLeGYgH020WbeWswpjygMpNbn43Rctc1VohRM93ezI=; b=QT5K8R+0YjEZtj8HMHgE7MPnLNGNVyaIxT6VrtL7DxYH1EMyzcLqB1Q/ckIUUA5YJZ TPFXiWNpvTX0XaX1PfMAwVDsu+s4HdElonwJVcNsM408QZ/nrBCSRctmsHH40uaBrnXs jGkwnN2mDkGD8G6lTXh9Iiao/tqVHGSpPZsgX7ZZo5Q/bf2vKRHWZd/gYHq3dUGkiFD5 x7bpye1JSd7VZeCn+oIADr6S02lKbRgbad/MlIxNHq93qnIUpyzeS9BREHTFMXaK0Sv6 m2ZR1GzGfpX4h5Sx7FsPr3kFYdyvyQ7AQUPO/WadqXpjVA3YYLedKE4QvHaH1dZHx+et A15w== X-Gm-Message-State: APf1xPBYot1dR9W5lv6I+HBtsL73cDqBXClxxX2V0HVElLc+nVn6NaiJ SkyCxQe5LPSrsZZ6yW2QFPXtPVbE X-Google-Smtp-Source: AH8x227E6ZNWbyfZFijQbNFBbMD4dYH89Pyb3pRrPjFB8hCq3EikjD1NmOR5L4xt8oShEKlQ9tI4tw== X-Received: by 10.223.157.135 with SMTP id p7mr626489wre.33.1519044772810; Mon, 19 Feb 2018 04:52:52 -0800 (PST) Received: from adacore.com ([46.18.100.10]) by smtp.gmail.com with ESMTPSA id b136sm17615576wme.34.2018.02.19.04.52.50 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 19 Feb 2018 04:52:52 -0800 (PST) Received: by adacore.com (sSMTP sendmail emulation); Mon, 19 Feb 2018 13:52:48 +0100 From: Xavier Roirand To: gdb-patches@sourceware.org Cc: brobecker@adacore.com, Xavier Roirand Subject: [RFA] Fix frame argument printing when using auto language mode Date: Mon, 19 Feb 2018 13:52:47 +0100 Message-Id: <1519044767-8741-1-git-send-email-roirand@adacore.com> X-IsSubscribed: yes When debugging a mixed Ada/C program using this scenario: - set print frame-arguements all - an Ada function named pck.call_me calls a C function named break_me - you put a breakpoint in break_me and the program reaches this breakpoint. Now display the backtrace: (gdb) bt #0 break_me () at [...] #1 0x000000000040243e in pck.call_me ( s={P_ARRAY = 0x7fffffffe21c, P_BOUNDS = 0x41e6e8}) at [...] whereas we should expect: (gdb) bt #0 break_me () at [...] #1 0x000000000040243e in pck.call_me (s="test") at [...] The problem is that GDB prints the S parameter in the pck.call_me Ada function using the current language, so the C one, because the program is stopped in a C function, whereas it should use the pck.call_me frame one. This behavior is ok when user manually changes the language but it's not the right one when language is auto. This patch fixes this problem so now when using auto language, GDB ensures that each frame arguments are printed using the language of the frame, even if the program is stopped in a frame using a different language. If the user explicitly sets a language (using "set language ...") then no change here, all the frame arguments are printed using this language. gdb/ChangeLog: * stack.c (print_frame_arg): Set/restore current language to each frame's language when using auto mode. gdb/testsuite/ChangeLog: * gdb.ada/frame_arg_lang.exp: New testcase. * gdb.ada/frame_arg_lang/bla.adb: New file. * gdb.ada/frame_arg_lang/pck.ads: New file. * gdb.ada/frame_arg_lang/pck.adb: New file. * gdb.ada/frame_arg_lang/foo.c: New file. Tested on x86_64-linux using AdaCore's testsuite. Change-Id: Ic00e30933905dc72f9c8d2f2fba9ccabf7d02983 --- gdb/stack.c | 24 +++++++-- gdb/testsuite/gdb.ada/frame_arg_lang.exp | 74 ++++++++++++++++++++++++++++ gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb | 22 +++++++++ gdb/testsuite/gdb.ada/frame_arg_lang/foo.c | 22 +++++++++ gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb | 24 +++++++++ gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads | 18 +++++++ 6 files changed, 181 insertions(+), 3 deletions(-) create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang.exp create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang/foo.c create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb create mode 100644 gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads diff --git a/gdb/stack.c b/gdb/stack.c index 9993ae6..19f2381 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -268,6 +268,7 @@ print_frame_arg (const struct frame_arg *arg) { const struct language_defn *language; struct value_print_options opts; + const struct language_defn *saved_current_language = NULL; /* Avoid value_print because it will deref ref parameters. We just want to print their addresses. Print ??? for args whose @@ -277,10 +278,24 @@ print_frame_arg (const struct frame_arg *arg) annotate_arg_value (value_type (arg->val)); - /* Use the appropriate language to display our symbol, unless the - user forced the language to a specific language. */ + /* Use the appropriate language to display our symbol, + unless the user forced the language to a specific + language. + There's a problem when using language_mode_auto since + some language specific functions do not print properly + the frame argument because they do not have/use the + LANGUAGE parameter given to common_val_print but use + global current_language variable instead. + To solve this, we switch the current language to the + language of the frame argument for each argument then + we finally restore the current language. */ + if (language_mode == language_mode_auto) - language = language_def (SYMBOL_LANGUAGE (arg->sym)); + { + language = language_def (SYMBOL_LANGUAGE (arg->sym)); + saved_current_language = current_language; + current_language = language; + } else language = current_language; @@ -292,6 +307,9 @@ print_frame_arg (const struct frame_arg *arg) opts.summary = !strcmp (print_frame_arguments, "scalars"); common_val_print (arg->val, &stb, 2, &opts, language); + + if (saved_current_language != NULL) + current_language = saved_current_language; } CATCH (except, RETURN_MASK_ERROR) { diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang.exp b/gdb/testsuite/gdb.ada/frame_arg_lang.exp new file mode 100644 index 0000000..d387977 --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang.exp @@ -0,0 +1,74 @@ +# Copyright 2018 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +load_lib "ada.exp" + +standard_ada_testfile bla +set cfile "${testdir}/foo" +set csrcfile ${srcdir}/${subdir}/${cfile}.c +set cobject [standard_output_file ${cfile}.o] + +gdb_compile "${csrcfile}" "${cobject}" object [list debug] +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-largs additional_flags=${cobject} additional_flags=-margs]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.c] +runto "foo.c:$bp_location" + +gdb_test_no_output "set print frame-arguments all" + +# Here is the scenario: +# - Once stopped in a C function, with language_mode set to auto, print +# backtrace, we should see the Ada frame arguments printed using Ada +# syntax. +# - Set language to C, then check that printing backtrace shows the Ada +# frame arguments using C syntax. +# - Set language back to auto, check language mode value, then print +# backtrace, we should see Ada frame arguments printed using Ada C +# syntax. + +gdb_test "show lang" \ + "The current source language is \"auto; currently c\"." \ + "show language #1" + +gdb_test "bt" \ + "#1 $hex in pck\\.call_me \\(s=\"test\"\\).*" \ + "backtrace (auto: c)" + +gdb_test_no_output "set language c" \ + "Set current source language to \"manual; currently c\"." + +gdb_test "show lang" \ + "The current source language is \"c\"." \ + "show language #2" + +gdb_test "bt" \ + "#1 $hex in pck\\.call_me \\(s={P_ARRAY = $hex, P_BOUNDS = $hex}\\).*" \ + "backtrace (manual: c)" + +gdb_test_no_output "set language auto" \ + "Set current source language to \"auto; currently c\"." + +gdb_test "show lang" \ + "The current source language is \"auto; currently c\"." \ + "show language #3" + +gdb_test "bt" \ + "#1 $hex in pck\\.call_me \\(s=\"test\"\\).*" \ + "backtrace (auto: ada)" + diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb b/gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb new file mode 100644 index 0000000..dc772d6 --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang/bla.adb @@ -0,0 +1,22 @@ +-- Copyright 2018 Free Software Foundation, Inc. +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +with Pck; use Pck; + +procedure Bla is + S : String := "test"; +begin + Call_Me (S); +end Bla; diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang/foo.c b/gdb/testsuite/gdb.ada/frame_arg_lang/foo.c new file mode 100644 index 0000000..859d23c --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang/foo.c @@ -0,0 +1,22 @@ +/* Copyright 2018 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +int +break_me (void) +{ + return 0; /* STOP */ +} diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb b/gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb new file mode 100644 index 0000000..3d674a4 --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang/pck.adb @@ -0,0 +1,24 @@ +-- Copyright 2018 Free Software Foundation, Inc. +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +package body Pck is + procedure C_Break_Me; + pragma Import (C, C_Break_Me, "break_me"); + + procedure Call_Me (S: in out String) is + begin + C_Break_Me; + end Call_Me; +end Pck; diff --git a/gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads b/gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads new file mode 100644 index 0000000..2f6ee60 --- /dev/null +++ b/gdb/testsuite/gdb.ada/frame_arg_lang/pck.ads @@ -0,0 +1,18 @@ +-- Copyright 2018 Free Software Foundation, Inc. +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . + +package Pck is + procedure Call_Me (S: in out String); +end Pck;