diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c28e9463ddefa6ca23fcb87988e82660fb25693c..7deeca506dcdaeb5d1e45d2e13b19a95306044e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/51761
+	* gimple.h (struct gimplify_ctx): Add in_cleanup_point_expr
+	field.
+	* gimplify.c (gimplify_cleanup_point_expr): Save and set
+	in_cleanup_point_expr before gimplify_stmt call and restore it
+	afterwards.
+	(gimplify_target_expr): Don't add {CLOBBER} cleanup if
+	in_cleanup_point_expr is false.
+
 2012-01-05  Richard Guenther  <rguenther@suse.de>
 
 	PR middle-end/51764
diff --git a/gcc/gimple.h b/gcc/gimple.h
index 9ac8f26c55fc471161e3b29aa5e96c5c5f6109e2..484d1a0b407e50dc38d0ba69ede297a37d5beb23 100644
--- a/gcc/gimple.h
+++ b/gcc/gimple.h
@@ -1,6 +1,6 @@
 /* Gimple IR definitions.
 
-   Copyright 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
    Contributed by Aldy Hernandez <aldyh@redhat.com>
 
 This file is part of GCC.
@@ -1092,6 +1092,7 @@ struct gimplify_ctx
   bool save_stack;
   bool into_ssa;
   bool allow_rhs_cond_expr;
+  bool in_cleanup_point_expr;
 };
 
 extern enum gimplify_status gimplify_expr (tree *, gimple_seq *, gimple_seq *,
diff --git a/gcc/gimplify.c b/gcc/gimplify.c
index 14d627e7254f256b22df287a44fecc10e4b505b2..5f2cbf3c7695605a8a5bfb03d46bc5f4b3ec8a68 100644
--- a/gcc/gimplify.c
+++ b/gcc/gimplify.c
@@ -1,7 +1,7 @@
 /* Tree lowering pass.  This pass converts the GENERIC functions-as-trees
    tree representation into the GIMPLE form.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+   2012 Free Software Foundation, Inc.
    Major work done by Sebastian Pop <s.pop@laposte.net>,
    Diego Novillo <dnovillo@redhat.com> and Jason Merrill <jason@redhat.com>.
 
@@ -5226,13 +5226,16 @@ gimplify_cleanup_point_expr (tree *expr_p, gimple_seq *pre_p)
      any cleanups collected outside the CLEANUP_POINT_EXPR.  */
   int old_conds = gimplify_ctxp->conditions;
   gimple_seq old_cleanups = gimplify_ctxp->conditional_cleanups;
+  bool old_in_cleanup_point_expr = gimplify_ctxp->in_cleanup_point_expr;
   gimplify_ctxp->conditions = 0;
   gimplify_ctxp->conditional_cleanups = NULL;
+  gimplify_ctxp->in_cleanup_point_expr = true;
 
   gimplify_stmt (&TREE_OPERAND (*expr_p, 0), &body_sequence);
 
   gimplify_ctxp->conditions = old_conds;
   gimplify_ctxp->conditional_cleanups = old_cleanups;
+  gimplify_ctxp->in_cleanup_point_expr = old_in_cleanup_point_expr;
 
   for (iter = gsi_start (body_sequence); !gsi_end_p (iter); )
     {
@@ -5408,7 +5411,8 @@ gimplify_target_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
 
       /* Add a clobber for the temporary going out of scope, like
 	 gimplify_bind_expr.  */
-      if (needs_to_live_in_memory (temp))
+      if (gimplify_ctxp->in_cleanup_point_expr
+	  && needs_to_live_in_memory (temp))
 	{
 	  tree clobber = build_constructor (TREE_TYPE (temp), NULL);
 	  TREE_THIS_VOLATILE (clobber) = true;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1064393e13882e6d6a9e70dfe0d0a0a2088e9945..725c79cb180f197c644b8331b1b423840dfb1911 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-05  Jakub Jelinek  <jakub@redhat.com>
+
+	PR middle-end/51761
+	* gcc.c-torture/compile/pr51761.c: New test.
+
 2012-01-05  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/51760
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr51761.c b/gcc/testsuite/gcc.c-torture/compile/pr51761.c
new file mode 100644
index 0000000000000000000000000000000000000000..68911c84ce109405b58e8ca63b0e5e943177efbb
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr51761.c
@@ -0,0 +1,10 @@
+/* PR middle-end/51761 */
+
+struct S { unsigned int len; };
+struct S foo (struct S);
+
+struct S
+bar (struct S x)
+{
+  return ({ struct S a = x; foo (a); });
+}