diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7296dec723bb7054af2103f7421620972931c848..669741c3c721c51f97ebe412c9b7de60156cd837 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,8 @@
-2011-03-20  Jakub Jelinek  <jakub@redhat.com>
+2011-03-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gimplify.c (gimplify_vla_decl): Set TREE_THIS_NOTRAP flag.
+
+2011-03-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/42544
 	PR c/48197
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 0b314a068c393a20d1ebf5e7f6658b2f49453e43..c034ec29228061f37e359599e9aec923711b87fc 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -1322,6 +1322,7 @@ gimplify_vla_decl (tree decl, gimple_seq *seq_p)
   addr = create_tmp_var (ptr_type, get_name (decl));
   DECL_IGNORED_P (addr) = 0;
   t = build_fold_indirect_ref (addr);
+  TREE_THIS_NOTRAP (t) = 1;
   SET_DECL_VALUE_EXPR (decl, t);
   DECL_HAS_VALUE_EXPR_P (decl) = 1;