From 7cb7d208bb9e7811a2343d018ec196b59d6e1998 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 10 Oct 2012 14:27:59 +0000 Subject: lto-streamer-in.c (lto_input_location_bitpack): Rename to ... 2012-10-10 Richard Biener * lto-streamer-in.c (lto_input_location_bitpack): Rename to ... (lto_input_location): ... this. Kill original. (input_eh_region): Adjust. (input_struct_function_base): Likewise. (lto_read_tree): Likewise. * lto-streamer-out.c (lto_output_location_bitpack): Rename to ... (lto_output_location): ... this. Kill original. (lto_write_tree): Adjust. (output_eh_region): Likewise. (output_struct_function_base): Likewise. * lto-streamer.c (lto_streamer_hooks_init): Initialize location hooks. * lto-streamer.h (lto_input_location): Adjust prototype. (lto_output_location): Likewise. * streamer-hooks.h (struct streamer_hooks): Adjust prototype of input_location and output_location hooks. (stream_input_location): New define. (stream_output_location): Likewise. * tree-streamer-in.c (unpack_ts_block_value_fields): Adjust. (unpack_value_fields): Likewise. (streamer_read_tree_bitfields): Likewise. (lto_input_ts_decl_minimal_tree_pointers): Likewise. (lto_input_ts_exp_tree_pointers): Likewise. (lto_input_ts_block_tree_pointers): Likewise. * tree-streamer-out.c (pack_ts_block_value_fields): Adjust. (streamer_pack_tree_bitfields): Likewise. (write_ts_decl_minimal_tree_pointers): Likewise. (write_ts_exp_tree_pointers): Likewise. (write_ts_block_tree_pointers): Likewise. * gimple-streamer-in.c (input_phi): Adjust. (input_gimple_stmt): Likewise. * gimple-streamer-out.c (output_phi): Adjust. (output_gimple_stmt): Likewise. * tree-streamer.h (streamer_read_tree_bitfields): Adjust prototype. (streamer_pack_tree_bitfields): Likewise. From-SVN: r192317 --- gcc/gimple-streamer-out.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gcc/gimple-streamer-out.c') diff --git a/gcc/gimple-streamer-out.c b/gcc/gimple-streamer-out.c index 22bcbca..e49400b 100644 --- a/gcc/gimple-streamer-out.c +++ b/gcc/gimple-streamer-out.c @@ -43,7 +43,9 @@ output_phi (struct output_block *ob, gimple phi) { stream_write_tree (ob, gimple_phi_arg_def (phi, i), true); streamer_write_uhwi (ob, gimple_phi_arg_edge (phi, i)->src->index); - lto_output_location (ob, gimple_phi_arg_location (phi, i)); + bitpack_d bp = bitpack_create (ob->main_stream); + stream_output_location (ob, &bp, gimple_phi_arg_location (phi, i)); + streamer_write_bitpack (&bp); } } @@ -71,10 +73,10 @@ output_gimple_stmt (struct output_block *ob, gimple stmt) bp_pack_value (&bp, gimple_assign_nontemporal_move_p (stmt), 1); bp_pack_value (&bp, gimple_has_volatile_ops (stmt), 1); bp_pack_var_len_unsigned (&bp, stmt->gsbase.subcode); - streamer_write_bitpack (&bp); /* Emit location information for the statement. */ - lto_output_location (ob, LOCATION_LOCUS (gimple_location (stmt))); + stream_output_location (ob, &bp, LOCATION_LOCUS (gimple_location (stmt))); + streamer_write_bitpack (&bp); /* Emit the lexical block holding STMT. */ stream_write_tree (ob, gimple_block (stmt), true); -- cgit v1.1