summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2010-12-29 21:49:37 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2010-12-29 21:49:37 +0000
commitec4a428c4dcd48ee4af60c680ea86405a5dd110b (patch)
tree2d95a70278eb778e4eb63f7d461f1e1dbabdf5c4 /gcc
parenta99b81ea952a4ed4c1da95ca08c1117ebc58ca6d (diff)
downloadgcc-ec4a428c4dcd48ee4af60c680ea86405a5dd110b.tar.gz
PR tree-optimization/47074
* gimple-fold.c (gimplify_and_update_call_from_tree): Call pop_gimplify_context if returning early. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@168325 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/gimple-fold.c1
2 files changed, 7 insertions, 0 deletions
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);