From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1738 invoked by alias); 15 Mar 2009 18:25:11 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 1471 invoked by uid 9674); 15 Mar 2009 18:25:00 -0000 Date: Sun, 15 Mar 2009 18:25:00 -0000 Message-ID: <20090315182458.1455.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer: Merge commit 'origin/archer-jankratochvil-expr' into archer X-Git-Refname: refs/heads/archer X-Git-Reftype: branch X-Git-Oldrev: fd1a379f54b2a5df830f510c735bc45c8aec572b X-Git-Newrev: f2a07ac5bb676a5272544caa0d20610fce1c8d7d X-SW-Source: 2009-q1/txt/msg00337.txt.bz2 List-Id: The branch, archer has been updated via f2a07ac5bb676a5272544caa0d20610fce1c8d7d (commit) via 080bd8d32716a948a67f28e8bc12f0a0f3370931 (commit) via 281278326412f9d6a3fabb8adc1d419fd7ddc7d7 (commit) via 9e42aad941db9ee30a36cb0cc288789cbbff0836 (commit) via 12fab790f9fd169f857fbffcf66241e913d1f473 (commit) from fd1a379f54b2a5df830f510c735bc45c8aec572b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit f2a07ac5bb676a5272544caa0d20610fce1c8d7d Merge: 080bd8d32716a948a67f28e8bc12f0a0f3370931 281278326412f9d6a3fabb8adc1d419fd7ddc7d7 Author: Jan Kratochvil Date: Sun Mar 15 19:17:33 2009 +0100 Merge commit 'origin/archer-jankratochvil-expr' into archer commit 080bd8d32716a948a67f28e8bc12f0a0f3370931 Merge: fd1a379f54b2a5df830f510c735bc45c8aec572b 12fab790f9fd169f857fbffcf66241e913d1f473 Author: Jan Kratochvil Date: Sun Mar 15 19:17:25 2009 +0100 Merge commit 'origin/archer-jankratochvil-misc' into archer ----------------------------------------------------------------------- Summary of changes: gdb/dwarf2read.c | 2 +- gdb/testsuite/gdb.dwarf2/dw2-strp.S | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) First 500 lines of diff: diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index f3225ce..0b1504a 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -8926,7 +8926,7 @@ static char * dwarf2_canonicalize_name (char *name, struct dwarf2_cu *cu, struct obstack *obstack) { - if (cu->language == language_cplus) + if (name && cu->language == language_cplus) { char *canon_name = cp_canonicalize_string (name); diff --git a/gdb/testsuite/gdb.dwarf2/dw2-strp.S b/gdb/testsuite/gdb.dwarf2/dw2-strp.S index a1602a5..293cc1b 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-strp.S +++ b/gdb/testsuite/gdb.dwarf2/dw2-strp.S @@ -28,7 +28,8 @@ /* CU die */ .uleb128 1 /* Abbrev: DW_TAG_compile_unit */ .4byte .Lproducer /* DW_AT_producer */ - .byte 1 /* DW_AT_language (C) */ + /* Use C++ to exploit a bug in parsing DW_AT_name "". */ + .byte 4 /* DW_AT_language (C++) - */ .Larray_type: .uleb128 2 /* Abbrev: DW_TAG_array_type */ @@ -60,6 +61,10 @@ .Lconst_type: .uleb128 6 /* Abbrev: DW_TAG_const_type */ .4byte .Larray_type-.Lcu1_begin/* DW_AT_type */ + + .uleb128 7 /* Abbrev: DW_TAG_variable (name "") */ + .4byte .Lemptyname /* DW_AT_name */ + .byte 0 /* End of children of CU */ .Lcu1_end: @@ -126,6 +131,15 @@ .uleb128 0x13 /* DW_FORM_ref4 */ .byte 0x0 /* Terminator */ .byte 0x0 /* Terminator */ + + .uleb128 7 /* Abbrev code */ + .uleb128 0x34 /* DW_TAG_variable */ + .byte 0x0 /* DW_children_no */ + .uleb128 0x3 /* DW_AT_name */ + .uleb128 0xe /* DW_FORM_strp */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ + .byte 0x0 /* Terminator */ /* String table */ @@ -140,3 +154,5 @@ .string "a_string" .Lvarcontents: .string "hello world!\n" +.Lemptyname: + .string "" hooks/post-receive -- Repository for Project Archer.