diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 753f3ceadb12..2643e608f045 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-11  Richard Henderson  <rth@redhat.com>
+
+	PR middle-end/23312
+	* gimplify.c (gimplify_one_sizepos): Check for INTEGER_TYPE
+	before using TYPE_IS_SIZETYPE.
+
 2005-08-11  Richard Henderson  <rth@redhat.com>
 
 	PR target/22225
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index d207e7c55469..a1ef22e0d2ba 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -4634,7 +4634,9 @@ gimplify_one_sizepos (tree *expr_p, tree *stmt_p)
      type-stripping code with this knowledge because it doesn't matter
      for the bulk of GENERIC/GIMPLE.  It only matters that TYPE_SIZE_UNIT
      and friends retain their "sizetype-ness".  */
-  if (TREE_TYPE (expr) != type && TYPE_IS_SIZETYPE (type))
+  if (TREE_TYPE (expr) != type
+      && TREE_CODE (type) == INTEGER_TYPE
+      && TYPE_IS_SIZETYPE (type))
     {
       tree tmp;