From 03da52864c9025823694a9b5fabc472c6e534658 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Sat, 6 Apr 2002 17:22:00 -0500
Subject: [PATCH] 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
---
 gcc/cp/ChangeLog                         | 4 ++++
 gcc/cp/error.c                           | 2 +-
 gcc/testsuite/g++.dg/template/nontype1.C | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/nontype1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 524cbeaf3b5..e739e2a0a11 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 499f726b012..579f584912b 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 00000000000..834a36a26a0
--- /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; };