diff options
| -rw-r--r-- | gcc/jit/ChangeLog | 19 | ||||
| -rw-r--r-- | gcc/jit/dummy-frontend.c | 14 | ||||
| -rw-r--r-- | gcc/jit/jit-playback.c | 25 | ||||
| -rw-r--r-- | gcc/jit/jit-playback.h | 4 |
4 files changed, 27 insertions, 35 deletions
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index 8cd7823..6610da9 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,3 +1,22 @@ +2015-06-05 David Malcolm <dmalcolm@redhat.com> + + * dummy-frontend.c (jit_langhook_write_globals): Rename to... + (jit_langhook_post_compilation_parsing_cleanups): ...this, and + eliminate calls to finalize_compilation_unit and + write_global_decls_2. + (LANG_HOOKS_WRITE_GLOBALS): Rename to... + (LANG_HOOKS_POST_COMPILATION_PARSING_CLEANUPS): ...this and + redirect from jit_langhook_write_globals to + jit_langhook_post_compilation_parsing_cleanups. + * jit-playback.c + (gcc::jit::playback::context::write_global_decls_1): Rename to... + (gcc::jit::playback::context::finalize_global_decls): ...this. + (gcc::jit::playback::context::write_global_decls_1): Delete. + * jit-playback.h + (gcc::jit::playback::context::write_global_decls_1): Rename to... + (gcc::jit::playback::context::finalize_global_decls): ...this. + (gcc::jit::playback::context::write_global_decls_1): Delete. + 2015-06-04 Andrew MacLeod <amacleod@redhat.com> * dummy-frontend.c: Adjust includes for restructured coretypes.h. diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c index 38aa182..4a7966d 100644 --- a/gcc/jit/dummy-frontend.c +++ b/gcc/jit/dummy-frontend.c @@ -219,18 +219,13 @@ jit_langhook_getdecls (void) } static void -jit_langhook_write_globals (void) +jit_langhook_post_compilation_parsing_cleanups (void) { gcc::jit::playback::context *ctxt = gcc::jit::active_playback_ctxt; gcc_assert (ctxt); JIT_LOG_SCOPE (ctxt->get_logger ()); - ctxt->write_global_decls_1 (); - - /* This is the hook that runs the middle and backends: */ - symtab->finalize_compilation_unit (); - - ctxt->write_global_decls_2 (); + ctxt->finalize_global_decls (); } #undef LANG_HOOKS_NAME @@ -260,8 +255,9 @@ jit_langhook_write_globals (void) #undef LANG_HOOKS_GETDECLS #define LANG_HOOKS_GETDECLS jit_langhook_getdecls -#undef LANG_HOOKS_WRITE_GLOBALS -#define LANG_HOOKS_WRITE_GLOBALS jit_langhook_write_globals +#undef LANG_HOOKS_POST_COMPILATION_PARSING_CLEANUPS +#define LANG_HOOKS_POST_COMPILATION_PARSING_CLEANUPS \ + jit_langhook_post_compilation_parsing_cleanups struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c index 0a81287..64478b7 100644 --- a/gcc/jit/jit-playback.c +++ b/gcc/jit/jit-playback.c @@ -668,14 +668,13 @@ as_truth_value (tree expr, location *loc) return expr; } -/* For use by jit_langhook_write_globals. +/* For use by jit_langhook_post_compilation_parsing_cleanups Calls varpool_node::finalize_decl on each global. */ void playback::context:: -write_global_decls_1 () +finalize_global_decls () { - /* Compare with e.g. the C frontend's c_write_global_declarations. */ JIT_LOG_SCOPE (get_logger ()); int i; @@ -687,26 +686,6 @@ write_global_decls_1 () } } -/* For use by jit_langhook_write_globals. - Calls debug_hooks->global_decl on each global. */ - -void -playback::context:: -write_global_decls_2 () -{ - /* Compare with e.g. the C frontend's c_write_global_declarations_2. */ - JIT_LOG_SCOPE (get_logger ()); - - int i; - tree decl; - FOR_EACH_VEC_ELT (m_globals, i, decl) - { - gcc_assert (TREE_CODE (decl) == VAR_DECL); - debug_hooks->global_decl (decl); - } -} - - /* Construct a playback::rvalue instance (wrapping a tree) for a unary op. */ diff --git a/gcc/jit/jit-playback.h b/gcc/jit/jit-playback.h index e9832f0..84d99e4 100644 --- a/gcc/jit/jit-playback.h +++ b/gcc/jit/jit-playback.h @@ -215,9 +215,7 @@ public: return m_recording_ctxt->errors_occurred (); } - /* For use by jit_langhook_write_globals. */ - void write_global_decls_1 (); - void write_global_decls_2 (); + void finalize_global_decls (); private: void dump_generated_code (); |