This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [patch] Fix internal error on canonicalization of clang types (+lib/gdb.exp internal error catch)


On Mon, 17 Sep 2012 10:28:52 +0200, Vasyl Vavrychuk wrote:
> Problem happening for the file
> 
> #include <cstdlib>
> #include <boost/uuid/uuid_generators.hpp>
> int main(int argc, char* argv[]) {
>   boost::uuids::random_generator gen;
>   return EXIT_SUCCESS;
> }
> 
> clang++ -g -O0 sizeof-space-test.cpp
> readelf -wi a.out|grep exact_unsigned_base_helper
>     <4072>   DW_AT_name        : (indirect string, offset: 0x3f3e):
> exact_unsigned_base_helper<sizeof(unsigned int) * 8>

Not reproducible for me with clang-3.1-9.fc18.x86_64 and
boost-1.50.0-2.fc18.x86_64.


> but if compiled with g++ there is no such typename in dwarf

I believe it belongs into GCC PR
	Bug 49130 - discrepancies between DW_AT_name and demangler 
	http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49130

as even GCC puts 'sizeof' into the (mangled) ELF function symbol but it does
not put it into the (demangled) DWARF type name.

So I have at least created a reproducer by hand.

No regressions on {x86_64,x86_64-m32,i686}-fedora18-linux-gnu.

I have also checked the whitespacing of the few other symbols from
libiberty/cp-demangle.c in cp-name-parser.y matches.


Thanks,
Jan


gdb/
2012-09-17  Jan Kratochvil  <jan.kratochvil@redhat.com>

        Fix internal error on canonicalization of clang types.
        * cp-name-parser.y (exp): Use "sizeof ".

gdb/testsuite/
2012-09-17  Jan Kratochvil  <jan.kratochvil@redhat.com>

        Fix internal error on canonicalization of clang types.
	* gdb.dwarf2/dw2-canonicalize-type.S: New file.
	* gdb.dwarf2/dw2-canonicalize-type.exp: New file.
	* lib/gdb.exp (gdb_file_cmd): Catch also GDB internal error.

diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index 6767fa5..c57ce64 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -1183,7 +1183,7 @@ exp	:	FLOAT
 	;
 
 exp	:	SIZEOF '(' type ')'	%prec UNARY
-		{ $$ = d_unary ("sizeof", $3); }
+		{ $$ = d_unary ("sizeof ", $3); }
 	;
 
 /* C++.  */
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.S b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.S
new file mode 100644
index 0000000..dbf8f0a
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.S
@@ -0,0 +1,102 @@
+/* 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/>.  */
+
+	.text
+	.globl main
+main:	.byte 0
+.Lmain_end:
+	.section	.debug_info
+debug_start:
+	.4byte	debug_end - 1f	/* Length of Compilation Unit Info */
+1:
+	.2byte	0x3	/* DWARF version number */
+	.4byte	.Ldebug_abbrev0	/* Offset Into Abbrev. Section */
+	.byte	0x4	/* Pointer Size (in bytes) */
+	.uleb128 0x1	/* (DIE (0xb) DW_TAG_compile_unit) */
+	.ascii "GNU C 4.4.3\0"	/* DW_AT_producer */
+	.byte	0x4	/* DW_AT_language = DW_LANG_C_plus_plus */
+	.ascii "1.c\0"	/* DW_AT_name */
+	.4byte	main		/* DW_AT_low_pc */
+	.4byte	.Lmain_end	/* DW_AT_high_pc */
+	.uleb128 0x4	/* (DIE (0x3c) DW_TAG_subprogram) */
+	.ascii "f\0"	/* DW_AT_name */
+/* Value 0 would require has_section_at_zero != 0 (which is true, though).  */
+	.4byte	main		/* DW_AT_low_pc */
+	.4byte	.Lmain_end	/* DW_AT_high_pc */
+	.byte	0x1	/* DW_AT_prototyped */
+	.uleb128 0x5	/* (DIE (0x42) DW_TAG_formal_parameter) */
+/* Invalid value.  */
+	.4byte	.Ltype_int - debug_start	/* DW_AT_type */
+	.ascii		"param\0"			/* DW_AT_name */
+	.byte	0x0	/* end of children of DIE 0x3c */
+.Ltype_int:
+	.uleb128	3			/* Abbrev: DW_TAG_base_type */
+	.ascii		"typename<sizeof(int)>\0"	/* DW_AT_name */
+	.byte		4			/* DW_AT_byte_size */
+	.byte		5			/* DW_AT_encoding */
+	.byte	0x0	/* end of children of DIE 0xb */
+debug_end:
+
+	.section	.debug_abbrev
+.Ldebug_abbrev0:
+	.uleb128 0x1	/* (abbrev code) */
+	.uleb128 0x11	/* (TAG: DW_TAG_compile_unit) */
+	.byte	0x1	/* DW_children_yes */
+	.uleb128 0x25	/* (DW_AT_producer) */
+	.uleb128 0x8	/* (DW_FORM_string) */
+	.uleb128 0x13	/* (DW_AT_language) */
+	.uleb128 0xb	/* (DW_FORM_data1) */
+	.uleb128 0x3	/* (DW_AT_name) */
+	.uleb128 0x8	/* (DW_FORM_string) */
+	.uleb128 0x11	/* (DW_AT_low_pc) */
+	.uleb128 0x1	/* (DW_FORM_addr) */
+	.uleb128 0x12	/* (DW_AT_high_pc) */
+	.uleb128 0x1	/* (DW_FORM_addr) */
+	.byte	0x0
+	.byte	0x0
+	.uleb128	3			/* Abbrev code */
+	.uleb128	0x24			/* DW_TAG_base_type */
+	.byte		0			/* has_children */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.uleb128	0xb			/* DW_AT_byte_size */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.uleb128	0x3e			/* DW_AT_encoding */
+	.uleb128	0xb			/* DW_FORM_data1 */
+	.byte		0x0			/* Terminator */
+	.byte		0x0			/* Terminator */
+	.uleb128 0x4	/* (abbrev code) */
+	.uleb128 0x2e	/* (TAG: DW_TAG_subprogram) */
+	.byte	0x1	/* DW_children_yes */
+	.uleb128 0x3	/* (DW_AT_name) */
+	.uleb128 0x8	/* (DW_FORM_string) */
+	.uleb128 0x11	/* (DW_AT_low_pc) */
+	.uleb128 0x1	/* (DW_FORM_addr) */
+	.uleb128 0x12	/* (DW_AT_high_pc) */
+	.uleb128 0x1	/* (DW_FORM_addr) */
+	.uleb128 0x27	/* (DW_AT_prototyped) */
+	.uleb128 0xc	/* (DW_FORM_flag) */
+	.byte	0x0
+	.byte	0x0
+	.uleb128 0x5	/* (abbrev code) */
+	.uleb128 0x5	/* (TAG: DW_TAG_formal_parameter) */
+	.byte	0x0	/* DW_children_no */
+	.uleb128 0x49	/* (DW_AT_type) */
+	.uleb128 0x13	/* (DW_FORM_ref4) */
+	.uleb128	0x3			/* DW_AT_name */
+	.uleb128	0x8			/* DW_FORM_string */
+	.byte	0x0
+	.byte	0x0
+	.byte	0x0
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp
new file mode 100644
index 0000000..2591bc7
--- /dev/null
+++ b/gdb/testsuite/gdb.dwarf2/dw2-canonicalize-type.exp
@@ -0,0 +1,29 @@
+# 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 dwarf.exp
+
+# This test can only be run on targets which support DWARF-2 and use gas.
+if {![dwarf2_support]} {
+    return 0  
+}
+
+standard_testfile .S
+set executable ${testfile}
+
+if [prepare_for_testing $testfile.exp $testfile $srcfile {nodebug}] {
+    return -1
+}
+
+gdb_test "ptype f" {type = void \(typename<sizeof \(int\)>\)}
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 0b4c679..8715c5e 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1277,6 +1277,11 @@ proc gdb_file_cmd { arg } {
             perror "($arg) No such file or directory"
 	    return -1
         }
+	-re "A problem internal to GDB has been detected" {
+	    fail "($arg) GDB internal error"
+	    gdb_internal_error_resync
+	    return -1
+	}
         -re "$gdb_prompt $" {
             perror "couldn't load $arg into $GDB."
 	    return -1


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]