diff options
| -rw-r--r-- | gcc/jit/ChangeLog | 11 | ||||
| -rw-r--r-- | gcc/jit/dummy-frontend.c | 14 | ||||
| -rw-r--r-- | gcc/jit/jit-playback.c | 20 | ||||
| -rw-r--r-- | gcc/jit/jit-playback.h | 2 |
4 files changed, 13 insertions, 34 deletions
diff --git a/gcc/jit/ChangeLog b/gcc/jit/ChangeLog index 6610da9..3230822 100644 --- a/gcc/jit/ChangeLog +++ b/gcc/jit/ChangeLog @@ -1,5 +1,16 @@ 2015-06-05 David Malcolm <dmalcolm@redhat.com> + * dummy-frontend.c + (jit_langhook_post_compilation_parsing_cleanups): Remove. + (LANG_HOOKS_POST_COMPILATION_PARSING_CLEANUPS): Remove + * jit-playback.c (gcc::jit::playback::context::new_global): Add + call to varpool_node::finalize_decl. + (gcc::jit::playback::context::finalize_global_decls): Remove. + * jit-playback.h + (gcc::jit::playback::context::finalize_global_decls): Remove. + +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 diff --git a/gcc/jit/dummy-frontend.c b/gcc/jit/dummy-frontend.c index 4a7966d..41d14f5 100644 --- a/gcc/jit/dummy-frontend.c +++ b/gcc/jit/dummy-frontend.c @@ -218,16 +218,6 @@ jit_langhook_getdecls (void) return NULL; } -static 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->finalize_global_decls (); -} - #undef LANG_HOOKS_NAME #define LANG_HOOKS_NAME "libgccjit" @@ -255,10 +245,6 @@ jit_langhook_post_compilation_parsing_cleanups (void) #undef LANG_HOOKS_GETDECLS #define LANG_HOOKS_GETDECLS jit_langhook_getdecls -#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; #include "gt-jit-dummy-frontend.h" diff --git a/gcc/jit/jit-playback.c b/gcc/jit/jit-playback.c index 64478b7..091a5ce 100644 --- a/gcc/jit/jit-playback.c +++ b/gcc/jit/jit-playback.c @@ -514,6 +514,8 @@ new_global (location *loc, varpool_node::get_create (inner); + varpool_node::finalize_decl (inner); + m_globals.safe_push (inner); return new lvalue (this, inner); @@ -668,24 +670,6 @@ as_truth_value (tree expr, location *loc) return expr; } -/* For use by jit_langhook_post_compilation_parsing_cleanups - Calls varpool_node::finalize_decl on each global. */ - -void -playback::context:: -finalize_global_decls () -{ - JIT_LOG_SCOPE (get_logger ()); - - int i; - tree decl; - FOR_EACH_VEC_ELT (m_globals, i, decl) - { - gcc_assert (TREE_CODE (decl) == VAR_DECL); - varpool_node::finalize_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 84d99e4..a6de566 100644 --- a/gcc/jit/jit-playback.h +++ b/gcc/jit/jit-playback.h @@ -215,8 +215,6 @@ public: return m_recording_ctxt->errors_occurred (); } - void finalize_global_decls (); - private: void dump_generated_code (); |