diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2fb57eae57ca..c0e804380e87 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-17  Tom de Vries  <tom@codesourcery.com>
+
+	* gimplify.c (gimplify_function_tree): Tentatively set PROP_gimple_lva
+	in cfun->curr_properties.
+	(gimplify_va_arg_expr): Clear PROP_gimple_lva in cfun->curr_properties
+	if we generate an IFN_VA_ARG.
+	* tree-inline.c (expand_call_inline): Reset PROP_gimple_lva in dest
+	function if PROP_gimple_lva is not set in src function.
+
 2015-04-17  Tom de Vries  <tom@codesourcery.com>
 	    Michael Matz  <matz@suse.de>
 
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index e1ea20491648..0394543ef7ba 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -9201,6 +9201,10 @@ gimplify_function_tree (tree fndecl)
   else
     push_struct_function (fndecl);
 
+  /* Tentatively set PROP_gimple_lva here, and reset it in gimplify_va_arg_expr
+     if necessary.  */
+  cfun->curr_properties |= PROP_gimple_lva;
+
   for (parm = DECL_ARGUMENTS (fndecl); parm ; parm = DECL_CHAIN (parm))
     {
       /* Preliminarily mark non-addressed complex variables as eligible
@@ -9295,7 +9299,7 @@ gimplify_function_tree (tree fndecl)
     }
 
   DECL_SAVED_TREE (fndecl) = NULL_TREE;
-  cfun->curr_properties = PROP_gimple_any;
+  cfun->curr_properties |= PROP_gimple_any;
 
   pop_cfun ();
 }
@@ -9414,6 +9418,10 @@ gimplify_va_arg_expr (tree *expr_p, gimple_seq *pre_p,
   tag = build_int_cst (build_pointer_type (type), 0);
   *expr_p = build_call_expr_internal_loc (loc, IFN_VA_ARG, type, 2, ap, tag);
 
+  /* Clear the tentatively set PROP_gimple_lva, to indicate that IFN_VA_ARG
+     needs to be expanded.  */
+  cfun->curr_properties &= ~PROP_gimple_lva;
+
   return GS_OK;
 }
 
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 83e43356f60b..42ddb9f47ed8 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -4526,6 +4526,14 @@ expand_call_inline (basic_block bb, gimple stmt, copy_body_data *id)
   id->src_cfun = DECL_STRUCT_FUNCTION (fn);
   id->call_stmt = stmt;
 
+  /* If the the src function contains an IFN_VA_ARG, then so will the dst
+     function after inlining.  */
+  if ((id->src_cfun->curr_properties & PROP_gimple_lva) == 0)
+    {
+      struct function *dst_cfun = DECL_STRUCT_FUNCTION (id->dst_fn);
+      dst_cfun->curr_properties &= ~PROP_gimple_lva;
+    }
+
   gcc_assert (!id->src_cfun->after_inlining);
 
   id->entry_bb = bb;