From e7547bc697688459e3e1ece81268e7b14addef22 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 5 Jun 2015 20:23:19 +0000 Subject: Fix build of jit after debug-early merger gcc/jit/ChangeLog: * 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. From-SVN: r224170 --- gcc/jit/dummy-frontend.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gcc/jit/dummy-frontend.c') 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; -- cgit v1.1