From patchwork Fri Feb 23 13:35:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Roirand X-Patchwork-Id: 26037 Received: (qmail 103152 invoked by alias); 23 Feb 2018 13:35:16 -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 103111 invoked by uid 89); 23 Feb 2018 13:35:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: mail-wr0-f195.google.com Received: from mail-wr0-f195.google.com (HELO mail-wr0-f195.google.com) (209.85.128.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Feb 2018 13:35:12 +0000 Received: by mail-wr0-f195.google.com with SMTP id f14so14104250wre.8 for ; Fri, 23 Feb 2018 05:35:12 -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=sS1ZJkUCwuO8wiwzAIFCRhI1vWNnVNHUHr//SwjmvK0=; b=p2fNmiuhjV2V5yFzvOAT9nf1fy50URVmdx08Gj/9pwTKR6Fl6qmN0JN2t5rQWj2QBA Y4v8ikdcoRFBnEelbOAqmrPOSleSQ/tshvoIYgepqCL2Jfg2hwRC+e//TzaA/MxA9IKD 0ZwWHs4pf4eC5Zoxowua35tb8OjBLcu/cY1sFIAvgFKimpZhRSSbUHrBq6pRde4neJz4 I8EW2nSTpy0LbU3f/bf7WAGd1BQkRvU1gXd3Mg7ArpV2h6+Z6W0EiGYCIHgVVg8s5veE Nhu9+EtUTrKjiCzUHVkimJDs/N8oBnFEqkN3u1DfUqpbcrfmvQPbTSX/Pt57HbgDG9CG 7a2w== X-Gm-Message-State: APf1xPBTdH50tXJ64rod6IMOQatXYreonW04wd3LiorqoVufUcHq40GL EPUvXBm41yXj0RvLohvdR2UfdUfj X-Google-Smtp-Source: AH8x226aZPOdUtNhGpWXvpMw+3Ix3LoPK7bp5RVUhNeyaTzQhHLGWJ5qy04WVdctpuzFGW4O4ig1Sg== X-Received: by 10.223.178.206 with SMTP id g72mr1605912wrd.135.1519392910163; Fri, 23 Feb 2018 05:35:10 -0800 (PST) Received: from adacore.com ([46.18.100.10]) by smtp.gmail.com with ESMTPSA id 32sm2426947wrm.14.2018.02.23.05.35.08 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 23 Feb 2018 05:35:09 -0800 (PST) Received: by adacore.com (sSMTP sendmail emulation); Fri, 23 Feb 2018 14:35:05 +0100 From: Xavier Roirand To: gdb-patches@sourceware.org Cc: brobecker@adacore.com, Xavier Roirand Subject: [RFA v3] (Ada) Fix frame argument printing when using auto language mode Date: Fri, 23 Feb 2018 14:35:01 +0100 Message-Id: <1519392901-21680-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, each Ada frame arguments are printed using Ada like syntax when the frame is part of Ada code, 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 Ada frame arguments are printed using this language. gdb/ChangeLog: * ada-valprint.c: Add external ada_language_defn declaration. (ada_val_print): Use ada language definition when calling print function. 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 --- gdb/ada-valprint.c | 4 +- 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, 163 insertions(+), 1 deletion(-) 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/ada-valprint.c b/gdb/ada-valprint.c index a486919..f6a1132 100644 --- a/gdb/ada-valprint.c +++ b/gdb/ada-valprint.c @@ -33,6 +33,8 @@ #include "objfiles.h" #include "target-float.h" +extern const struct language_defn ada_language_defn; + static int print_field_values (struct type *, const gdb_byte *, int, struct ui_file *, int, @@ -1208,7 +1210,7 @@ ada_val_print (struct type *type, { ada_val_print_1 (type, embedded_offset, address, stream, recurse, val, options, - current_language); + &ada_language_defn); } 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..5a8193f --- /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 "foo" +set csrcfile ${srcdir}/${subdir}/${testdir}/${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 with 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 with 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 with 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;