Re: [PATCH] Fix mi "-var-create" regression

[Luis Machado <lgustavo@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 1509 bytes --]

On 11/15/2012 10:50 PM, Marc Khouzam wrote:
> I think it would be faster if you took care of it.
>
> Much appreciated!
>
> (sorry for the top-post)
>
>
> Best regards,
>
> Marc
>
>
> ----- Original Message -----
> From: Luis Machado<lgustavo@codesourcery.com>
> To: Marc Khouzam<marc.khouzam@ericsson.com>
> Cc: 'Tom Tromey'<tromey@redhat.com>, 'Joel Brobecker'<brobecker@adacore.com>, "'lgustavo@codesourcery.com'"<lgustavo@codesourcery.com>, "'gdb-patches@sourceware.org'"<gdb-patches@sourceware.org>
> Sent: 15-11-2012 18:28
> Subject: Re: [PATCH] Fix mi "-var-create" regression
>
>
>
> On 11/15/2012 06:54 PM, Marc Khouzam wrote:
>>> -----Original Message-----
>>> From: Tom Tromey [mailto:tromey@redhat.com]
>>> Sent: Thursday, November 15, 2012 1:47 PM
>>> To: Joel Brobecker
>>> Cc: Marc Khouzam; 'lgustavo@codesourcery.com';
>>> 'gdb-patches@sourceware.org'
>>> Subject: Re: [PATCH] Fix mi "-var-create" regression
>>>
>>>>>>>> "Joel" == Joel Brobecker<brobecker@adacore.com>   writes:
>>>
>>> Joel>   I haven't looked at the patch itself, but at this
>>> point, we really
>>> Joel>   want any of them to be extra safe. If the approver
>>> thinks so, then
>>> Joel>   it can go in.
>>>
>>> I think it would be fine.
>>
>> Thanks!
>>
>> So how does it work?  Luis, are you ok to check it in to 7_5
>> yourself or should I do it (am I even allowed to do that?)
>
> Either option is fine with me. If you want, i can check it in.
>
> Regards,
> Luis

Done.

Attached is what i checked in.

Regards,
Luis

[-- Attachment #2: rtti-print-object.diff --]
[-- Type: text/x-patch, Size: 3914 bytes --]

2012-10-15  Luis Machado  <lgustavo@codesourcery.com>

	gdb/
	* value.c (value_actual_type): Check for TYPE_CODE_STRUCT
	target types.

	gdb/testsuite/
	* gdb.mi/mi-var-create-rtti.c: New file.
	* gdb.mi/mi-var-create-rtti.exp: New file.

Index: gdb/gdb/value.c
===================================================================
--- gdb.orig/gdb/value.c	2012-10-28 20:22:13.209235579 -0200
+++ gdb/gdb/value.c	2012-10-28 20:27:07.857218717 -0200
@@ -850,8 +850,12 @@ value_actual_type (struct value *value,
   result = value_type (value);
   if (opts.objectprint)
     {
-      if (TYPE_CODE (result) == TYPE_CODE_PTR
+      /* If result's target type is TYPE_CODE_STRUCT, proceed to
+	 fetch its rtti type.  */
+      if ((TYPE_CODE (result) == TYPE_CODE_PTR
 	  || TYPE_CODE (result) == TYPE_CODE_REF)
+	  && TYPE_CODE (check_typedef (TYPE_TARGET_TYPE (result)))
+	     == TYPE_CODE_STRUCT)
         {
           struct type *real_type;
 
Index: gdb/gdb/testsuite/gdb.mi/mi-var-create-rtti.c
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ gdb/gdb/testsuite/gdb.mi/mi-var-create-rtti.c	2012-10-28 19:27:03.241424995 -0200
@@ -0,0 +1,24 @@
+/* This testcase is part of GDB, the GNU debugger.
+
+   Copyright 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 <http://www.gnu.org/licenses/>.  */
+
+int
+main (void)
+{
+  int i = 0;
+
+  return i; /* next-line */
+}
Index: gdb/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ gdb/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp	2012-10-28 20:21:34.737237782 -0200
@@ -0,0 +1,52 @@
+# Copyright 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 <http://www.gnu.org/licenses/>.
+
+load_lib mi-support.exp
+set MIFLAGS "-i=mi"
+
+gdb_exit
+if [mi_gdb_start] {
+    continue
+}
+
+standard_testfile .c
+set opts {debug}
+
+if [build_executable $testfile.exp $testfile $srcfile $opts] {
+    return -1
+}
+
+mi_delete_breakpoints
+mi_gdb_reinitialize_dir $srcdir/$subdir
+mi_gdb_load ${binfile}
+
+if ![mi_run_to_main] {
+    untested "could not run to main"
+    return -1
+}
+
+# Test creating a register-based variable.  We pick
+# register SP since it is a pointer to data.  This checks
+# for a regression when creating MI variables from pointers
+# with "print object" enabled.
+
+# Enable "print object"
+mi_gdb_test "-gdb-set print object on" ".*"
+
+# Test creating a variable for $sp
+mi_gdb_test "-var-create sp1 * \$sp" \
+	    "\\^done,name=\"sp1\",numchild=\"0\",value=\"$hex\",type=\"void \\*\",has_more=\"0\"" \
+	    "-var-create sp1 * \$sp"
+gdb_exit