* testsuite/demangle-expected: Add four tests for type_info

	mangling.

	* cplus-dem.c (gnu_special): Use do_type, not demangle_fund_type,
	for a non-template non-qualified type_info function or node.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 99267f55201fa6320ce432c17392cc53c9e3e9bc..27de2ac80c0ec49ba0fbbce7189cd5af2a663911 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-10  Hans-Peter Nilsson  <hp@axis.com>
+
+       * testsuite/demangle-expected: Add four tests for type_info
+       mangling.
+
+       * cplus-dem.c (gnu_special): Use do_type, not demangle_fund_type,
+       for a non-template non-qualified type_info function or node.
+
 2000-08-31  DJ Delorie  <dj@redhat.com>
 
        * configure.in (Cygwin): special case cygwin only when we're

diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 0611d76d0f99dc8a48f4684819eea2204bf8e1a5..da951331d55498e361c354dccecec1627cb30489 100644 (file)
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -2873,7 +2873,7 @@ gnu_special (work, mangled, declp)
          success = demangle_template (work, mangled, declp, 0, 1, 1);
          break;
        default:
-         success = demangle_fund_type (work, mangled, declp);
+         success = do_type (work, mangled, declp);
          break;
        }
       if (success && **mangled != '\0')

diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected
index 0f947924a6290d847d00511c3af18322c36a79fd..fb6448cffdfad711664829a60aa941e9e674bb51 100644 (file)
--- a/libiberty/testsuite/demangle-expected
+++ b/libiberty/testsuite/demangle-expected
@@ -2542,3 +2542,19 @@ TA<int, N___A___<-99> >::foo__bar___foobar___(void)
 --format=gnu
 foo__bar___foobar_____t2TA2ZiZt4N__A1i9
 TA<int, N__A<9> >::foo__bar___foobar___(void)
+#
+--format=gnu
+__tfP8sockaddr
+sockaddr * type_info function
+#
+--format=gnu
+__tfPQ25libcwt16option_event_tct1Z12burst_app_ct
+libcw::option_event_tct<burst_app_ct> * type_info function
+#
+--format=gnu
+__tiP8sockaddr
+sockaddr * type_info node
+#
+--format=gnu
+__tiPQ25libcwt16option_event_tct1Z12burst_app_ct
+libcw::option_event_tct<burst_app_ct> * type_info node