diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 817d483d38c..18fb789461f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-04  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/39636
+	* tree-ssa-forwprop.c
+	(forward_propagate_addr_into_variable_array_index): Check for
+	GIMPLE_ASSIGN before accessing the rhs code.
+
 2009-04-03  Jason Merrill  <jason@redhat.com>
 
 	* stor-layout.c (set_sizetype): Set TYPE_CANONICAL.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 45e0c115c72..3e322f5524d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-04  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/39636
+	* gcc.c-torture/compile/pr39636.c: New testcase.
+
 2009-04-03  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR rtl-optimization/39607
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr39636.c b/gcc/testsuite/gcc.c-torture/compile/pr39636.c
new file mode 100644
index 00000000000..ceddbb3efed
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr39636.c
@@ -0,0 +1,11 @@
+typedef float real;
+typedef real rvec[3];
+void calc_dx2dx(real *, real *);
+void phi_sr(int nj,rvec x[],int k)
+{
+  int i,j;
+  for(i=0; (i<nj-1); i++)
+    for(j=i+1; (j<nj); j++)
+      if (k)
+	calc_dx2dx(x[i],x[j]);
+}
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index c3e7d432528..ff6bda0b1de 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -668,7 +668,8 @@ forward_propagate_addr_into_variable_array_index (tree offset,
 					       tunit)) != NULL_TREE)
        {
 	 gimple offset_def2 = SSA_NAME_DEF_STMT (gimple_assign_rhs1 (offset_def));
-	 if (gimple_assign_rhs_code (offset_def2) == MULT_EXPR
+	 if (is_gimple_assign (offset_def2)
+	     && gimple_assign_rhs_code (offset_def2) == MULT_EXPR
 	     && TREE_CODE (gimple_assign_rhs2 (offset_def2)) == INTEGER_CST
 	     && tree_int_cst_equal (gimple_assign_rhs2 (offset_def2), tunit))
 	   {