From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 22 Dec 2011 11:19:13 +0000 (+0000)
Subject: * cp-name-parser.y (cp_merge_demangle_parse_infos): Don't use
X-Git-Tag: gdb_7_4-2012-01-24-release~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4102a1958a6337d1d7ece6af24cbbdd19b5498a5;p=thirdparty%2Fbinutils-gdb.git

* cp-name-parser.y (cp_merge_demangle_parse_infos): Don't use
obstack_empty_p.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4a4c1a2a2d..ed766c71671 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-22  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* cp-name-parser.y (cp_merge_demangle_parse_infos): Don't use
+	obstack_empty_p.
+
 2011-12-21  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
 	PR tdep/12797
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index f257370c2e9..b0262f2307d 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -2029,9 +2029,6 @@ cp_merge_demangle_parse_infos (struct demangle_parse_info *dest,
      cp_demangled_parse_info_free is called.  */
   src->info = NULL;
 
-  /* Assert if the SRC obstack is not empty.  */
-  gdb_assert (obstack_empty_p (&src->obstack));
-
   /* Free SRC.  */
   cp_demangled_name_parse_free (src);
 }