diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91deba0361a4..340a738a8bb5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-31  Richard Sandiford  <richard.sandiford@arm.com>
+
+	* tree-vectorizer.h (_stmt_vec_info::same_dr_stmt): Change from
+	a gimple stmt to a stmt_vec_info.
+	* tree-vect-stmts.c (vectorizable_load): Update accordingly.
+
 2018-07-31  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* tree-vectorizer.h (vec_info::grouped_stores): Change from
diff --git a/gcc/tree-vect-stmts.c b/gcc/tree-vect-stmts.c
index 257ab076b349..288bdfaa5994 100644
--- a/gcc/tree-vect-stmts.c
+++ b/gcc/tree-vect-stmts.c
@@ -7590,8 +7590,7 @@ vectorizable_load (gimple *stmt, gimple_stmt_iterator *gsi,
 	 we have to give up.  */
       if (DR_GROUP_SAME_DR_STMT (stmt_info)
 	  && (STMT_SLP_TYPE (stmt_info)
-	      != STMT_SLP_TYPE (vinfo_for_stmt
-				 (DR_GROUP_SAME_DR_STMT (stmt_info)))))
+	      != STMT_SLP_TYPE (DR_GROUP_SAME_DR_STMT (stmt_info))))
 	{
 	  if (dump_enabled_p ())
 	    dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location,
diff --git a/gcc/tree-vectorizer.h b/gcc/tree-vectorizer.h
index 24020d239f12..daa63fd515cf 100644
--- a/gcc/tree-vectorizer.h
+++ b/gcc/tree-vectorizer.h
@@ -876,7 +876,7 @@ struct _stmt_vec_info {
   stmt_vec_info next_element;
   /* For data-refs, in case that two or more stmts share data-ref, this is the
      pointer to the previously detected stmt with the same dr.  */
-  gimple *same_dr_stmt;
+  stmt_vec_info same_dr_stmt;
   /* The size of the group.  */
   unsigned int size;
   /* For stores, number of stores from this group seen. We vectorize the last