diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-29 12:37:05 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-08-29 12:37:05 +0000 |
| commit | 12cb78d1cca1387a092ec0bd49c250340bff4afc (patch) | |
| tree | 1eab97da96906e0a2786d51d9f25f20de02befcf /gcc/lto-streamer-in.c | |
| parent | 31879e18aea3222fe3e56f2c0319c9f230645ff3 (diff) | |
| download | gcc-12cb78d1cca1387a092ec0bd49c250340bff4afc.tar.gz | |
2012-08-29 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 190745 using svnmerge, notably
C++ conversion.
[gcc/]
2012-08-29 Basile Starynkevitch <basile@starynkevitch.net>
{{merging with trunk, converted to C++}}
* melt-runtime.h (MELT_FLEXIBLE_DIM): Set when C++.
* melt-runtime.c (melt_tempdir_path): Don't use choose_tmpdir from
libiberty.
(meltgc_start_module_by_index): Use address-of & on VEC_index.
(melt_really_initialize): When printing builtin settings, handle
GCC 4.8 as with implicit ENABLE_BUILD_WITH_CXX.
(meltgc_out_edge): Provide additional flag TDF_DETAILS for dump_edge_info.
(melt_val2passflag): Handle PROP_referenced_vars only when defined.
* melt-module.mk: Use GCCMELT_COMPILER instead of GCCMELT_CC.
* melt-build-script.tpl: Transmit GCCMELT_COMPILER on every make
using melt-module.mk and improve the error message.
* melt-build-script.sh: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@190778 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/lto-streamer-in.c')
| -rw-r--r-- | gcc/lto-streamer-in.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gcc/lto-streamer-in.c b/gcc/lto-streamer-in.c index 98390940f12..cca216cd842 100644 --- a/gcc/lto-streamer-in.c +++ b/gcc/lto-streamer-in.c @@ -38,11 +38,9 @@ along with GCC; see the file COPYING3. If not see #include "function.h" #include "ggc.h" #include "diagnostic.h" -#include "libfuncs.h" #include "except.h" #include "debug.h" #include "vec.h" -#include "timevar.h" #include "ipa-utils.h" #include "data-streamer.h" #include "gimple-streamer.h" @@ -711,7 +709,7 @@ input_ssa_names (struct lto_input_block *ib, struct data_in *data_in, ssa_name = make_ssa_name_fn (fn, name, gimple_build_nop ()); if (is_default_def) - set_default_def (SSA_NAME_VAR (ssa_name), ssa_name); + set_ssa_default_def (cfun, SSA_NAME_VAR (ssa_name), ssa_name); i = streamer_read_uhwi (ib); } @@ -799,7 +797,6 @@ input_struct_function_base (struct function *fn, struct data_in *data_in, bp = streamer_read_bitpack (ib); fn->is_thunk = bp_unpack_value (&bp, 1); fn->has_local_explicit_reg_vars = bp_unpack_value (&bp, 1); - fn->after_tree_profile = bp_unpack_value (&bp, 1); fn->returns_pcc_struct = bp_unpack_value (&bp, 1); fn->returns_struct = bp_unpack_value (&bp, 1); fn->can_throw_non_call_exceptions = bp_unpack_value (&bp, 1); @@ -982,6 +979,9 @@ lto_read_body (struct lto_file_decl_data *file_data, tree fn_decl, push_cfun (fn); init_tree_ssa (fn); + /* We input IL in SSA form. */ + cfun->gimple_df->in_ssa_p = true; + /* Use the function's decl state. */ decl_state = lto_get_function_in_decl_state (file_data, fn_decl); gcc_assert (decl_state); @@ -1018,9 +1018,6 @@ lto_read_body (struct lto_file_decl_data *file_data, tree fn_decl, } } - /* We should now be in SSA. */ - cfun->gimple_df->in_ssa_p = true; - /* Restore decl state */ file_data->current_decl_state = file_data->global_decl_state; |