From: Jason Merrill <jason@redhat.com>
Date: Fri, 11 Mar 2011 14:44:49 +0000 (-0500)
Subject: re PR c++/48069 (FAIL: g++.old-deja/g++.pt/spec26.C)
X-Git-Tag: releases/gcc-4.6.0~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30f7cdcde6e9933e55e6bae37b5f5e785b28fa90;p=thirdparty%2Fgcc.git

re PR c++/48069 (FAIL: g++.old-deja/g++.pt/spec26.C)

	PR c++/48069
	* tree.c (type_hash_eq): Use COMPLETE_TYPE_P, not
	COMPLETE_OR_UNBOUND_ARRAY_TYPE_P.

From-SVN: r170872
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 988e19e8298b..4eb10249beb1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-11  Jason Merrill  <jason@redhat.com>
+
+	PR c++/48069
+	* tree.c (type_hash_eq): Use COMPLETE_TYPE_P, not
+	COMPLETE_OR_UNBOUND_ARRAY_TYPE_P.
+
 2011-03-11  Martin Jambor  <mjambor@suse.cz>
 
 	* cgraphunit.c (verify_cgraph_node): Call cgraph_get_node instead of
diff --git a/gcc/tree.c b/gcc/tree.c
index 2e1b9a308bd1..d923ac89a766 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -5988,8 +5988,7 @@ type_hash_eq (const void *va, const void *vb)
   /* Be careful about comparing arrays before and after the element type
      has been completed; don't compare TYPE_ALIGN unless both types are
      complete.  */
-  if (COMPLETE_OR_UNBOUND_ARRAY_TYPE_P (a->type)
-      && COMPLETE_OR_UNBOUND_ARRAY_TYPE_P (b->type)
+  if (COMPLETE_TYPE_P (a->type) && COMPLETE_TYPE_P (b->type)
       && (TYPE_ALIGN (a->type) != TYPE_ALIGN (b->type)
 	  || TYPE_MODE (a->type) != TYPE_MODE (b->type)))
     return 0;