diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fbbb310294f..332490b4ab4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-29  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/47074
+	* gimple-fold.c (gimplify_and_update_call_from_tree): Call
+	pop_gimplify_context if returning early.
+
 2010-12-28  Sebastian Pop  <sebastian.pop@amd.com>
 
 	* Makefile.in (graphite.o): Depends on DIAGNOSTIC_CORE_H.
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c
index 16a2092f043..042c813647e 100644
--- a/gcc/gimple-fold.c
+++ b/gcc/gimple-fold.c
@@ -942,6 +942,7 @@ gimplify_and_update_call_from_tree (gimple_stmt_iterator *si_p, tree expr)
 	 which gets optimized away by C++ gimplification.  */
       if (gimple_seq_empty_p (stmts))
 	{
+	  pop_gimplify_context (NULL);
 	  if (gimple_in_ssa_p (cfun))
 	    {
 	      unlink_stmt_vdef (stmt);