public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: sami wagiaalla <swagiaal@redhat.com>
To: gdb-patches@sourceware.org
Subject: [patch] stabs assertion failure  symbol_get_demangled_name
Date: Wed, 28 Jul 2010 20:16:00 -0000	[thread overview]
Message-ID: <4C509011.2040207@redhat.com> (raw)

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

Pedro reported a crash of code compiled with stabs on

gdb_assert(gsymbol->language_specific.cplus_specific != NULL);

in symbol_get_demangled_name. The problem was that 
stabsread.c:define_symbol was calling cp_scan_for_anonymous_namespaces 
before setting the name. I corrected that but there other case, and for 
those I changed the assertion into an if statement that returns null 
since symbol_natural_name depends on symbol_get_demangled_name to return 
null in order to fall back to gsymbol->name.

This was tested by running the test suite and compiling
member-ptr with -gstabs breaking on main executing a few commands and 
printing some values.

Sami

[-- Attachment #2: stabs.patch --]
[-- Type: text/plain, Size: 1575 bytes --]

Fixed stabs cplus_specific issue

2010-07-28  Sami Wagiaalla  <swagiaal@redhat.com>

	* symtab.c (symbol_get_demangled_name): Remove assertion and
	return NULL when language_specific.cplus_specific is not initialized.
	* stabsread.c (define_symbol): Set the name before calling 
	cp_scan_for_anonymous_namespaces.
	
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index b62156c..7a68d7a 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -712,7 +712,6 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type,
 	  memcpy (name, string, p - string);
 	  name[p - string] = '\0';
 	  new_name = cp_canonicalize_string (name);
-	  cp_scan_for_anonymous_namespaces (sym);
 	}
       if (new_name != NULL)
 	{
@@ -721,6 +720,10 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type,
 	}
       else
 	SYMBOL_SET_NAMES (sym, string, p - string, 1, objfile);
+
+      if (SYMBOL_LANGUAGE (sym) == language_cplus)
+	cp_scan_for_anonymous_namespaces (sym);
+
     }
   p++;
 
diff --git a/gdb/symtab.c b/gdb/symtab.c
index ec0e809..822c89c 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -381,10 +381,10 @@ char *
 symbol_get_demangled_name (const struct general_symbol_info *gsymbol)
 {
   if (gsymbol->language == language_cplus)
-    {
-      gdb_assert (gsymbol->language_specific.cplus_specific != NULL);
+    if (gsymbol->language_specific.cplus_specific != NULL)
       return gsymbol->language_specific.cplus_specific->demangled_name;
-    }
+    else
+      return NULL;
   else
     return gsymbol->language_specific.mangled_lang.demangled_name;
 }

             reply	other threads:[~2010-07-28 20:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-28 20:16 sami wagiaalla [this message]
2010-08-03 16:59 ` Pedro Alves
2010-08-03 17:48 ` sami wagiaalla

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C509011.2040207@redhat.com \
    --to=swagiaal@redhat.com \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).