From: Jim Wilson <wilson@gcc.gnu.org>
Date: Sat, 18 Jun 1994 20:58:57 +0000 (-0700)
Subject: (process_init_element): For fieldtype, don't access
X-Git-Tag: misc/cutover-egcs-0~6422
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d33b2a9b9f2b7d119bdb15812f8dd1cf958687e;p=thirdparty%2Fgcc.git

(process_init_element): For fieldtype, don't access
TYPE_MAIN_VARIANT field if the type is error_mark_node.

From-SVN: r7521
---

diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 7742e35a4977..659a3e375a0a 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -5999,7 +5999,9 @@ process_init_element (value)
 	      break;
 	    }
 
-	  fieldtype = TYPE_MAIN_VARIANT (TREE_TYPE (constructor_fields));
+	  fieldtype = TREE_TYPE (constructor_fields);
+	  if (fieldtype != error_mark_node)
+	    fieldtype = TYPE_MAIN_VARIANT (fieldtype);
 	  fieldcode = TREE_CODE (fieldtype);
 
 	  /* Accept a string constant to initialize a subarray.  */
@@ -6060,7 +6062,9 @@ process_init_element (value)
 	      break;
 	    }
 
-	  fieldtype = TYPE_MAIN_VARIANT (TREE_TYPE (constructor_fields));
+	  fieldtype = TREE_TYPE (constructor_fields);
+	  if (fieldtype != error_mark_node)
+	    fieldtype = TYPE_MAIN_VARIANT (fieldtype);
 	  fieldcode = TREE_CODE (fieldtype);
 
 	  /* Accept a string constant to initialize a subarray.  */