cplus-dem.c (gnu_special): Fix handling of virtual tables in anonymous namespaces.

	* cplus-dem.c (gnu_special): Fix handling of virtual tables in
	anonymous namespaces.

From-SVN: r23324

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ba44da35edf8d7a2a4fed3073fbee7fe8941cb12..653882818d64334205a1c038e463e3f19034205a 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+1998-10-25  Mark Mitchell  <mark@markmitchell.com>
+
+       * cplus-dem.c (gnu_special): Fix handling of virtual tables in
+       anonymous namespaces.
+       
 1998-10-23  Mark Mitchell  <mark@markmitchell.com>
 
        * cplus-dem.c (work_stuff): Replace const_type and volatile_type
@@ -14,7 +19,7 @@
        (demangle_template_value_parm): Likewise.
        (do_type): Likewise.
        (demangle_fund_type)): Likewise.
-       
+
 Thu Oct 22 19:58:43 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * splay-tree.c (splay_tree_foreach_helper): Make definition static

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 4a4a12965e5575be4ef1abafa0b7cde8feed262d..d4718d780a2db6d2691e656c821a09e255ad7002 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -2097,7 +2097,6 @@ gnu_special (work, mangled, declp)
        (*mangled) += 4; /* Old style, no thunks: "_vt<CPLUS_MARKER>" */
       while (**mangled != '\0')
        {
-         p = strpbrk (*mangled, cplus_markers);
          switch (**mangled)
            {
            case 'Q':
@@ -2130,6 +2129,7 @@ gnu_special (work, mangled, declp)
              (*mangled) += n;
            }
 
+         p = strpbrk (*mangled, cplus_markers);
          if (success && ((p == NULL) || (p == *mangled)))
            {
              if (p != NULL)