From: Jason Merrill <jason@redhat.com>
Date: Sun, 1 Sep 2002 07:44:00 +0000 (-0400)
Subject: * cp-lang.c (cp_expr_size): Don't abort.
X-Git-Tag: releases/gcc-3.2.1~339
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=218104c7983123214d361ef84e0f9adb5f70e3f0;p=thirdparty%2Fgcc.git

* cp-lang.c (cp_expr_size): Don't abort.

From-SVN: r56719
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index e7c5b8c5316d..8fcb4aad1581 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-31  Jason Merrill  <jason@redhat.com>
+
+	* cp-lang.c (cp_expr_size): Don't abort.
+
 2002-08-27  Mark Mitchell  <mark@codesourcery.com>
 
 	* cp-tree.h (warn_abi): Declare it.
diff --git a/gcc/cp/cp-lang.c b/gcc/cp/cp-lang.c
index 7b1d860a08e6..b573cce317b1 100644
--- a/gcc/cp/cp-lang.c
+++ b/gcc/cp/cp-lang.c
@@ -122,14 +122,8 @@ cp_expr_size (exp)
 {
   if (CLASS_TYPE_P (TREE_TYPE (exp)))
     {
-      /* The backend should not be interested in the size of an expression
-	 of a type with both of these set; all copies of such types must go
-	 through a constructor or assignment op.  */
-      if (TYPE_HAS_COMPLEX_INIT_REF (TREE_TYPE (exp))
-	  && TYPE_HAS_COMPLEX_ASSIGN_REF (TREE_TYPE (exp)))
-	abort ();
-      /* This would be wrong for a type with virtual bases, but they are
-	 caught by the abort above.  */
+      /* This would be wrong for a type with virtual bases, but they should
+	 not get here.  */
       return CLASSTYPE_SIZE_UNIT (TREE_TYPE (exp));
     }
   else