typeck.c (require_complete_type): Don't assume size_zero_node.

	* typeck.c (require_complete_type): Don't assume size_zero_node.
	(complete_type_or_else): Likewise.

From-SVN: r32605

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 425bc6308656750c5c1485fd12e7e26e2ba88928..eaf70b65182ae3690127f59e81324508e8514c95 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-17  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * typeck.c (require_complete_type): Don't assume size_zero_node.
+       (complete_type_or_else): Likewise.
+
 2000-03-16  Steven Grady <grady@digitaldeck.com>
            Jason Merrill  <jason@casey.cygnus.com>
 

diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 040cde7ed3f2aa1fb17d2f38f7e454df1f19c8d0..6e74e3bb7d8e060b5466cd470d521ab654a0f4d0 100644 (file)
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -106,8 +106,7 @@ require_complete_type (value)
     type = TREE_TYPE (value);
 
   /* First, detect a valid value with a complete type.  */
-  if (TYPE_SIZE (type) != 0
-      && TYPE_SIZE (type) != size_zero_node)
+  if (TYPE_SIZE (type) && !integer_zerop (TYPE_SIZE (type)))
     return value;
 
   /* If we see X::Y, we build an OFFSET_TYPE which has
@@ -177,7 +176,7 @@ complete_type_or_else (type, value)
   if (type == error_mark_node)
     /* We already issued an error.  */
     return NULL_TREE;
-  else if (!TYPE_SIZE (type) || TYPE_SIZE (type) == size_zero_node)
+  else if (!TYPE_SIZE (type) || integer_zerop (TYPE_SIZE (type)))
     {
       incomplete_type_error (value, type);
       return NULL_TREE;