From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 29 Apr 2002 15:11:36 +0000 (+0200)
Subject: re PR c++/6477 (Segfault on conflicting types in trivial code)
X-Git-Tag: releases/gcc-3.3.0~5408
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a73bffb63125f29e0e6bb7925f5a8a510560aef;p=thirdparty%2Fgcc.git

re PR c++/6477 (Segfault on conflicting types in trivial code)

	PR c++/6477
	* decl.c (follow_tag_typedef): Check if TYPE_NAME (original) is
	non-NULL first.

	* g++.dg/parse/typedef1.C: New test.

From-SVN: r52900
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9ad6e11b0495..8f9210500f31 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/6477
+	* decl.c (follow_tag_typedef): Check if TYPE_NAME (original) is
+	non-NULL first.
+
 2002-04-29  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/6492
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 450bc3988a80..9f03294c94a8 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5332,6 +5332,8 @@ follow_tag_typedef (type)
   tree original;
 
   original = original_type (type);
+  if (! TYPE_NAME (original))
+    return NULL_TREE;
   if (TYPE_IDENTIFIER (original) == TYPE_IDENTIFIER (type)
       && (CP_DECL_CONTEXT (TYPE_NAME (original))
 	  == CP_DECL_CONTEXT (TYPE_NAME (type)))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 722263a9d990..8c3477199105 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-29  Jakub Jelinek  <jakub@redhat.com>
+
+	* g++.dg/parse/typedef1.C: New test.
+
 2002-04-29  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/6486
diff --git a/gcc/testsuite/g++.dg/parse/typedef1.C b/gcc/testsuite/g++.dg/parse/typedef1.C
new file mode 100644
index 000000000000..5dbd16a154f7
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/typedef1.C
@@ -0,0 +1,3 @@
+// PR c++/6477
+typedef struct A_ *A;	// { dg-error "previous declaration as" }
+typedef struct A B;	// { dg-error "conflicting types" }