aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2005-12-20 04:59:42 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2005-12-20 04:59:42 +0000
commitc3115fd2d9b8c820af8900b35e3aec3857a3c888 (patch)
treed038d188b73f2f5d5ab1322b5853d8d799e855b6 /gcc
parent6b20b203a615aa0a301a006ec96531b1f23337a7 (diff)
downloadgcc-c3115fd2d9b8c820af8900b35e3aec3857a3c888.zip
gcc-c3115fd2d9b8c820af8900b35e3aec3857a3c888.tar.gz
gcc-c3115fd2d9b8c820af8900b35e3aec3857a3c888.tar.bz2
re PR c++/24278 (ICE while trying to print out error)
PR c++/24278 * init.c (expand_member_init): Print messages about baseclasses using %T rather than %D. PR c++/24278 * g++.dg/template/ctor5.C: New test. From-SVN: r108840
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/init.c8
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/g++.dg/template/ctor5.C8
4 files changed, 19 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3c79990..2b3c175 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
2005-12-19 Mark Mitchell <mark@codesourcery.com>
+ PR c++/24278
+ * init.c (expand_member_init): Print messages about baseclasses
+ using %T rather than %D.
+
PR c++/24915
* class.c (add_method): Do not treat templates as identical unless
their return types are the same.
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index f438467..f19842d 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -1019,11 +1019,11 @@ expand_member_init (tree name)
if (!direct_binfo && !virtual_binfo)
{
if (CLASSTYPE_VBASECLASSES (current_class_type))
- error ("type %qD is not a direct or virtual base of %qT",
- name, current_class_type);
+ error ("type %qT is not a direct or virtual base of %qT",
+ basetype, current_class_type);
else
- error ("type %qD is not a direct base of %qT",
- name, current_class_type);
+ error ("type %qT is not a direct base of %qT",
+ basetype, current_class_type);
return NULL_TREE;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e87eb1d..fe6953e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2005-12-19 Mark Mitchell <mark@codesourcery.com>
+ PR c++/24278
+ * g++.dg/template/ctor5.C: New test.
+
PR c++/24915
* g++.dg/template/overload8.C: New test.
diff --git a/gcc/testsuite/g++.dg/template/ctor5.C b/gcc/testsuite/g++.dg/template/ctor5.C
new file mode 100644
index 0000000..18e55d1
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ctor5.C
@@ -0,0 +1,8 @@
+// PR c++/24278
+
+template<typename T> struct A
+{
+ A() : T(0) {} // { dg-error "base" }
+};
+
+A<int*> a; // { dg-error "instantiated" }