From 976a81ee63d8fa4c6d7b9a8fd6f9f215cd7048e9 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 13 Feb 2013 13:31:18 +0000 Subject: [PATCH] re PR lto/56295 (Missed optimization with LTO) 2013-02-13 Richard Biener PR lto/56295 * gimple-streamer-out.c (output_gimple_stmt): Undo wrapping globals in MEM_REFs. From-SVN: r196013 --- gcc/ChangeLog | 6 ++++++ gcc/gimple-streamer-out.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 38339d0def7..334f8fedccf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2013-02-13 Richard Biener + + PR lto/56295 + * gimple-streamer-out.c (output_gimple_stmt): Undo wrapping + globals in MEM_REFs. + 2013-02-13 Richard Biener * loop-init.c (loop_optimizer_init): Clear loop state when diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c index 24ab0ed7181..adf230ed93a 100644 --- a/gcc/gimple-streamer-out.c +++ b/gcc/gimple-streamer-out.c @@ -116,13 +116,14 @@ output_gimple_stmt (struct output_block *ob, gimple stmt) for (i = 0; i < gimple_num_ops (stmt); i++) { tree op = gimple_op (stmt, i); + tree *basep = NULL; /* Wrap all uses of non-automatic variables inside MEM_REFs so that we do not have to deal with type mismatches on merged symbols during IL read in. The first operand of GIMPLE_DEBUG must be a decl, not MEM_REF, though. */ if (op && (i || !is_gimple_debug (stmt))) { - tree *basep = &op; + basep = &op; while (handled_component_p (*basep)) basep = &TREE_OPERAND (*basep, 0); if (TREE_CODE (*basep) == VAR_DECL @@ -136,8 +137,13 @@ output_gimple_stmt (struct output_block *ob, gimple stmt) (TREE_TYPE (*basep)), 0)); TREE_THIS_VOLATILE (*basep) = volatilep; } + else + basep = NULL; } stream_write_tree (ob, op, true); + /* Restore the original base if we wrapped it inside a MEM_REF. */ + if (basep) + *basep = TREE_OPERAND (TREE_OPERAND (*basep, 0), 0); } if (is_gimple_call (stmt)) { -- 2.30.2