diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index aaccb6efe1ebb166574bf36fc7175baae624fd10..751cc708ee6348a9da394397264644689eb0bb0c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,9 @@
 2005-06-26  Jakub Jelinek  <jakub@redhat.com>
 
+	PR middle-end/22028
+	* gimplify.c (gimplify_type_sizes): Check for type == error_mark_node
+	earlier in the function.
+
 	* regrename.c (copy_value): Don't replace fixed or global
 	regs with older regs.
 
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 156e56744a57f8f9a109748f8fc14b13eb37b367..8bc790877747b50e46b5c45607f2955b6756e583 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -4524,15 +4524,14 @@ gimplify_type_sizes (tree type, tree *list_p)
 {
   tree field, t;
 
-  if (type == NULL)
+  if (type == NULL || type == error_mark_node)
     return;
 
   /* We first do the main variant, then copy into any other variants.  */
   type = TYPE_MAIN_VARIANT (type);
 
   /* Avoid infinite recursion.  */
-  if (TYPE_SIZES_GIMPLIFIED (type)
-      || type == error_mark_node)
+  if (TYPE_SIZES_GIMPLIFIED (type))
     return;
 
   TYPE_SIZES_GIMPLIFIED (type) = 1;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 71961848bd3ac1c2642340d242c7ecedba4f91e5..a8ca329b3267bc295f6068d7b2d9d0ab4c5a99c5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/22028
+	* gcc.dg/20050620-1.c: New test.
+
 2005-06-26  Kazu Hirata  <kazu@codesourcery.com>
 
 	PR tree-optimization/22026
diff --git a/gcc/testsuite/gcc.dg/20050620-1.c b/gcc/testsuite/gcc.dg/20050620-1.c
new file mode 100644
index 0000000000000000000000000000000000000000..befdd9636500cfc8fe7db1bd4f67bee5796ed922
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/20050620-1.c
@@ -0,0 +1,15 @@
+/* PR middle-end/22028 */
+/* { dg-do compile } */
+/* { dg-options "" } */
+
+void
+foo (void)
+{
+  struct { int i[]; } u;	/* { dg-error "flexible array member" } */
+}
+
+void
+bar (void)
+{
+  struct { struct a b; } c;	/* { dg-error "has incomplete type" } */
+}