diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/lto-streamer-in.c | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 17882cd..3891aec 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,12 @@ 2014-08-06 Richard Biener <rguenther@suse.de> + 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 <rguenther@suse.de> + PR tree-optimization/61320 * tree-ssa-loop-ivopts.c (may_be_unaligned_p): Properly handle misaligned loads. diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index 698f926..9b95970 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); } |