aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2002-04-06 17:22:00 -0500
committerJason Merrill <jason@gcc.gnu.org>2002-04-06 17:22:00 -0500
commit03da52864c9025823694a9b5fabc472c6e534658 (patch)
tree8a9e5ecc4a811ebf02ef482ab8ec65048bb3c575 /gcc
parentf1526122aa999c5b5bf05a20755ac300dcbff155 (diff)
downloadgcc-03da52864c9025823694a9b5fabc472c6e534658.zip
gcc-03da52864c9025823694a9b5fabc472c6e534658.tar.gz
gcc-03da52864c9025823694a9b5fabc472c6e534658.tar.bz2
re PR c++/4934 (Seg fault on legal code)
PR c++/4934 * error.c (dump_expr) [CONVERT_EXPR]: Make sure TREE_TYPE (t) is set before checking it. From-SVN: r51972
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog4
-rw-r--r--gcc/cp/error.c2
-rw-r--r--gcc/testsuite/g++.dg/template/nontype1.C5
3 files changed, 10 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 524cbea..e739e2a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
2002-04-06 Jason Merrill <jason@redhat.com>
+ PR c++/4934
+ * error.c (dump_expr) [CONVERT_EXPR]: Make sure TREE_TYPE (t) is
+ set before checking it.
+
PR c++/525
* init.c (build_member_call): Use build_scoped_ref.
(resolve_offset_ref): Likewise.
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index 499f726..579f584 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1729,7 +1729,7 @@ dump_expr (t, flags)
break;
case CONVERT_EXPR:
- if (VOID_TYPE_P (TREE_TYPE (t)))
+ if (TREE_TYPE (t) && VOID_TYPE_P (TREE_TYPE (t)))
{
print_left_paren (scratch_buffer);
dump_type (TREE_TYPE (t), flags);
diff --git a/gcc/testsuite/g++.dg/template/nontype1.C b/gcc/testsuite/g++.dg/template/nontype1.C
new file mode 100644
index 0000000..834a36a
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/nontype1.C
@@ -0,0 +1,5 @@
+// PR c++/4934
+// dump_expr didn't know how to deal with a CONVERT_EXPR with no type.
+
+template<unsigned> struct A {};
+template<typename T> struct B { A<sizeof(+int())> a; };