From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11397 invoked by alias); 3 Feb 2012 07:34:32 -0000 Received: (qmail 11152 invoked by uid 22791); 3 Feb 2012 07:34:30 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_STOCKGEN X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 03 Feb 2012 07:34:14 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id A38C82BAFB4; Fri, 3 Feb 2012 02:34:13 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id tKbAQtMIa40J; Fri, 3 Feb 2012 02:34:13 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 7907D2BAFA1; Fri, 3 Feb 2012 02:34:12 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id 155FB145615; Fri, 3 Feb 2012 11:33:53 +0400 (RET) Date: Fri, 03 Feb 2012 07:34:00 -0000 From: Joel Brobecker To: Tom Tromey Cc: gdb-patches@sourceware.org Subject: Re: [PATCH] GDB/MI: crash printing "_task" (Ada) argument Message-ID: <20120203073352.GI31383@adacore.com> References: <1327906636-20099-1-git-send-email-brobecker@adacore.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="GxcwvYAGnODwn7V8" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-02/txt/msg00045.txt.bz2 --GxcwvYAGnODwn7V8 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-length: 543 > Joel> - sym2 = lookup_symbol (SYMBOL_NATURAL_NAME (sym), > Joel> + sym2 = lookup_symbol (SYMBOL_SEARCH_NAME (sym), > > Oops. Actually, I looked closer, and iterate_over_block_arg_vars uses > SYMBOL_LINKAGE_NAME. > > Either that is a latent bug, or I think your patch should follow it in > the same of consistency. Ah, yes, indeed. SYMBOL_LINKAGE_NAME is even better, I think, as it requires no name transformation, and we're sure to get an exact match. This is what I checked in (after re-testing). Thanks for the review! -- Joel --GxcwvYAGnODwn7V8 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="mi-ada-tasks-v2.diff" Content-length: 5994 commit 5780a060decabfb1b33e04118b283c2a23545261 Author: Joel Brobecker Date: Mon Jan 30 09:14:39 2012 +0400 gdb/ChangeLog: * mi/mi-cmd-stack.c (list_args_or_locals): For argument symbols, use SYMBOL_LINKAGE_NAME to find the corresponding non-argument symbol. Add assertion that sym2 is never NULL. gdb/testsuite/ChangeLog: * gdb.ada/mi_task_arg: New testcase. diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 871278f..a2151e5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2012-02-03 Joel Brobecker + + * mi/mi-cmd-stack.c (list_args_or_locals): For argument symbols, + use SYMBOL_LINKAGE_NAME to find the corresponding non-argument + symbol. Add assertion that sym2 is never NULL. + 2012-02-02 Doug Evans * blockframe.c (find_pc_partial_function_gnu_ifunc): Change type of diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c index c0c17bc..4ad9f7c 100644 --- a/gdb/mi/mi-cmd-stack.c +++ b/gdb/mi/mi-cmd-stack.c @@ -389,11 +389,12 @@ list_args_or_locals (enum what_to_list what, enum print_values values, struct frame_arg arg, entryarg; if (SYMBOL_IS_ARGUMENT (sym)) - sym2 = lookup_symbol (SYMBOL_NATURAL_NAME (sym), + sym2 = lookup_symbol (SYMBOL_LINKAGE_NAME (sym), block, VAR_DOMAIN, (int *) NULL); else sym2 = sym; + gdb_assert (sym2 != NULL); memset (&arg, 0, sizeof (arg)); arg.sym = sym2; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 143dae1..cbaca89 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-02-03 Joel Brobecker + + * gdb.ada/mi_task_arg: New testcase. + 2012-02-02 Pedro Alves * gdb.reverse/until-precsave.exp: Also put "record save" under the diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp new file mode 100644 index 0000000..a8cc59b --- /dev/null +++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp @@ -0,0 +1,51 @@ +# Copyright 2011-2012 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" + +set testdir "mi_task_arg" +set testfile "${testdir}/task_switch" +set srcfile ${srcdir}/${subdir}/${testfile}.adb +set binfile ${objdir}/${subdir}/${testfile} + +file mkdir ${objdir}/${subdir}/${testdir} +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { + return -1 +} + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +gdb_exit +if [mi_gdb_start] { + continue +} + +mi_delete_breakpoints +mi_gdb_reinitialize_dir $srcdir/$subdir +mi_gdb_load ${binfile} + +if ![mi_runto "task_switch.break_me"] then { + fail "Cannot run to main, testcase aborted" + return 0 +} + +# Verify that "-stack-list-arguments" does not cause the debugger to +# crash when printing the arguments of frame 1 (due to the internally- +# generated argument "_task"). +mi_gdb_test "-stack-list-arguments 1" \ + "\\^done,stack-args=\\\[frame=\{level=\"0\",args=\\\[\\\]\},frame=\{level=\"1\",args=\\\[\{name=\"<_task>\",value=\"$hex\"\}\\\]\},frame=\{level=\"2\",args=\\\[\\\]\}.*" \ + "-stack-list-arguments 1" + diff --git a/gdb/testsuite/gdb.ada/mi_task_arg/task_switch.adb b/gdb/testsuite/gdb.ada/mi_task_arg/task_switch.adb new file mode 100644 index 0000000..8ee1a2d --- /dev/null +++ b/gdb/testsuite/gdb.ada/mi_task_arg/task_switch.adb @@ -0,0 +1,70 @@ +-- Copyright 2011-2012 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 . + +procedure Task_Switch is + + ------------------- + -- Declaractions -- + ------------------- + + task type Callee is + entry Finito; + end Callee; + type Callee_Ptr is access Callee; + + task type Caller is + end Caller; + type Caller_Ptr is access Caller; + + procedure Break_Me; + + My_Caller : Caller_Ptr; + My_Callee : Callee_Ptr; + + ------------ + -- Bodies -- + ------------ + + task body Callee is + begin + -- Just wait until we are told to terminate this task. + -- This is just to maintain this task alive. + accept Finito do + null; + end Finito; + end Callee; + + task body Caller is + begin + Break_Me; + My_Callee.Finito; + end Caller; + + procedure Break_Me is + begin + null; + end Break_Me; + +begin + + -- Make sure to create the Callee task first... And then give it + -- enough time to complete its activation phase before we start + -- the Caller task. + My_Callee := new Callee; + delay 0.1; + + My_Caller := new Caller; + +end Task_Switch; --GxcwvYAGnODwn7V8--