diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0ebb6696b5d..20b6d358e3b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-01  Richard Henderson  <rth@redhat.com>
+
+	* tree-vectorizer.c (vect_analyze_offset_expr): Strip conversions
+	that don't narrow the value.  Fail for other conversions.
+
 2005-01-01  Richard Henderson  <rth@redhat.com>
 
 	PR c/19031
diff --git a/gcc/tree-vectorizer.c b/gcc/tree-vectorizer.c
index 5df56dfc93c..bd826d0127c 100644
--- a/gcc/tree-vectorizer.c
+++ b/gcc/tree-vectorizer.c
@@ -1390,7 +1390,22 @@ vect_analyze_offset_expr (tree expr,
   enum tree_code code;
   tree init, evolution, def_stmt;
 
-  STRIP_NOPS (expr);
+  /* Strip conversions that don't narrow the mode.  */
+  while (TREE_CODE (expr) == NOP_EXPR || TREE_CODE (expr) == CONVERT_EXPR)
+    {
+      tree to, ti;
+
+      to = TREE_TYPE (expr);
+      oprnd0 = TREE_OPERAND (expr, 0);
+      ti = TREE_TYPE (oprnd0);
+
+      if (!INTEGRAL_TYPE_P (to) || !INTEGRAL_TYPE_P (ti))
+	return false;
+      if (GET_MODE_SIZE (TYPE_MODE (to)) < GET_MODE_SIZE (TYPE_MODE (ti)))
+	return false;
+
+      expr = oprnd0;
+    }
   
   *step = NULL_TREE;
   *misalign = NULL_TREE;