Re: [debug-early, jit] Port of jit to debug-early

[David Malcolm <dmalcolm@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1922 bytes --]

On Fri, 2015-06-05 at 16:18 -0400, David Malcolm wrote:
> On Fri, 2015-06-05 at 15:37 -0400, Aldy Hernandez wrote:
> > On 06/05/2015 03:00 PM, David Malcolm wrote:
> > > "jit" isn't part of "all" languages, and currently fails to build on
> > > the aldyh/debug-early branch:
> > 
> > The debug-early work is now in mainline.  Feel free to commit when you 
> > deem appropriate, since you are the jit maintainer ;-).
> 
> Given that it fixes the build of the jit, I've gone ahead and committed
> the patch as-is to trunk (r224170).
> 
> > >   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 ();
> > 
> > This hook gets called after the compilation proper has run, and we're 
> > trying to avoid it.  We're trying to get all the front-ends to finish 
> > their thing and avoid depending on the compilation proper.
> > 
> > Can you not get this to work without running finalize_global_decls after 
> > the compilation proper?  If not, then I see no problem with your 
> > patch....after all, C++ is still using this hook :(.
> 
> Am investigating.

All that it was doing was calling varpool_node::finalize_decl on each
global; it appears that it's OK to instead call that on them as soon as
they're created (despite the name).

I've committed the attached patch to trunk (r224173) which removes the
hook; "make check-jit" gives the same results as before, and I again
hand-tested (with gdb) jit.dg's test-using-global.c and
test-fibonacci.c.

[-- Attachment #2: r224173.patch --]
[-- Type: text/x-patch, Size: 2995 bytes --]

Index: gcc/jit/ChangeLog
===================================================================
--- gcc/jit/ChangeLog	(revision 224172)
+++ gcc/jit/ChangeLog	(revision 224173)
@@ -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
Index: gcc/jit/dummy-frontend.c
===================================================================
--- gcc/jit/dummy-frontend.c	(revision 224172)
+++ gcc/jit/dummy-frontend.c	(revision 224173)
@@ -218,16 +218,6 @@
   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 @@
 #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"
Index: gcc/jit/jit-playback.c
===================================================================
--- gcc/jit/jit-playback.c	(revision 224172)
+++ gcc/jit/jit-playback.c	(revision 224173)
@@ -514,6 +514,8 @@
 
   varpool_node::get_create (inner);
 
+  varpool_node::finalize_decl (inner);
+
   m_globals.safe_push (inner);
 
   return new lvalue (this, inner);
@@ -668,24 +670,6 @@
   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.  */
 
Index: gcc/jit/jit-playback.h
===================================================================
--- gcc/jit/jit-playback.h	(revision 224172)
+++ gcc/jit/jit-playback.h	(revision 224173)
@@ -215,8 +215,6 @@
     return m_recording_ctxt->errors_occurred ();
   }
 
-  void finalize_global_decls ();
-
 private:
   void dump_generated_code ();