summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libiberty/ChangeLog8
-rw-r--r--libiberty/cplus-dem.c2
-rw-r--r--libiberty/testsuite/demangle-expected16
3 files changed, 25 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index d1da5d30fae..4b5923e284b 100644
--- 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-09-08 Alex Samuel <samuel@codesourcery.com>
* cp-demangle.c: Fix copyright banner.
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index e00f787e75c..79b6dc5ccf7 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -2872,7 +2872,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 0f947924a62..fb6448cffdf 100644
--- 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