diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 95b47f76411..1bbeb7b40b7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-24  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* var-tracking.c (track_expr_p): Do not return 0 for tracked record
+	parameters passed indirectly.
+
 2017-05-23  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.md (*movdi_internal): Remove SSE4
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index 1b9f8ddea6a..5c38c1dbd83 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -5220,8 +5220,9 @@ track_expr_p (tree expr, bool need_rtl)
   if (decl_rtl && MEM_P (decl_rtl))
     {
       /* Do not track structures and arrays.  */
-      if (GET_MODE (decl_rtl) == BLKmode
-	  || AGGREGATE_TYPE_P (TREE_TYPE (realdecl)))
+      if ((GET_MODE (decl_rtl) == BLKmode
+	   || AGGREGATE_TYPE_P (TREE_TYPE (realdecl)))
+	  && !tracked_record_parameter_p (realdecl))
 	return 0;
       if (MEM_SIZE_KNOWN_P (decl_rtl)
 	  && MEM_SIZE (decl_rtl) > MAX_VAR_PARTS)