From b12c44e901b1ba76db05370aaa61c86ed4df32d0 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 6 Aug 2014 13:53:09 +0000 Subject: [PATCH] re PR lto/62034 (ICE for big statically initialized arrays compiled with LTO) 2014-08-06 Richard Biener PR lto/62034 * lto-streamer-in.c (lto_input_tree_1): Assert we do not read SCCs here. (lto_input_tree): Pop SCCs here. From-SVN: r213664 --- gcc/ChangeLog | 7 +++++++ gcc/lto-streamer-in.c | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 17882cd96eb..3891aecd0de 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-08-06 Richard Biener + + PR lto/62034 + * lto-streamer-in.c (lto_input_tree_1): Assert we do not read + SCCs here. + (lto_input_tree): Pop SCCs here. + 2014-08-06 Richard Biener PR tree-optimization/61320 diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index 698f92620db..9b95970824e 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -1324,15 +1324,7 @@ lto_input_tree_1 (struct lto_input_block *ib, struct data_in *data_in, streamer_tree_cache_append (data_in->reader_cache, result, hash); } else if (tag == LTO_tree_scc) - { - unsigned len, entry_len; - - /* Input and skip the SCC. */ - lto_input_scc (ib, data_in, &len, &entry_len); - - /* Recurse. */ - return lto_input_tree (ib, data_in); - } + gcc_unreachable (); else { /* Otherwise, materialize a new node from IB. */ @@ -1345,7 +1337,15 @@ lto_input_tree_1 (struct lto_input_block *ib, struct data_in *data_in, tree lto_input_tree (struct lto_input_block *ib, struct data_in *data_in) { - return lto_input_tree_1 (ib, data_in, streamer_read_record_start (ib), 0); + enum LTO_tags tag; + + /* Input and skip SCCs. */ + while ((tag = streamer_read_record_start (ib)) == LTO_tree_scc) + { + unsigned len, entry_len; + lto_input_scc (ib, data_in, &len, &entry_len); + } + return lto_input_tree_1 (ib, data_in, tag, 0); }