Committed to branch dmalcolm/jit:
Turning optimizations up from 0 to 3 showed a segfault on the 2nd
iteration of test-linked-list.c in get_data_from_adhoc_loc whilst
garbage-collecting.
Investigation revealed the issue to be a CFG from the previous compile
being kept alive by this GC root in gcse.c:
static GTY(()) rtx test_insn;
This wouldn't it itself be an issue, but one (or more) of the edges had:
(gdb) p /x e->goto_locus
$9 = 0x80000000
and was thus treated as an ADHOC_LOC. Hence, this line in the edge_def's
gt_ggc_mx routine:
8313 tree block = LOCATION_BLOCK (e->goto_locus);
led to a call (via LOCATION_BLOCK) to get_data_from_adhoc_loc:
152 void *
153 get_data_from_adhoc_loc (struct line_maps *set, source_location loc)
154 {
155 linemap_assert (IS_ADHOC_LOC (loc));
156 return set->location_adhoc_data_map.data[loc &
MAX_SOURCE_LOCATION].data;
157 }
but at this point, the ad-hoc location data from the previous in-process
compile no longer makes sense, and, with:
(gdb) p set->location_adhoc_data_map
$5 = {htab = 0x60fbb0, curr_loc = 0, allocated = 0, data = 0x0}
the read though the NULL "data" segfaults.
gcse.c appears to create test_insn on-demand as part of the implementation of
can_assign_to_reg_without_clobbers_p.
Hence it seems to make most sense to simply clear test_insn in toplev_finalize,
which this commit does.
With this, the whole test suite now runs successfully with optimizations
on, so also turn this up (in harness.h) from 0 to 3.
gcc/
* gcse.c (gcse_c_finalize): New, to clear test_insn between
in-process compiles.
* gcse.h (gcse_c_finalize): New.
* toplev.c: Include "gcse.h" so that we can...
(toplev_finalize): Call gcse_c_finalize.
gcc/testsuite/
* jit.dg/harness.h (set_options): Increase optimization level from
0 to 3.
---
gcc/ChangeLog.jit | 8 ++++++++
gcc/gcse.c | 5 +++++
gcc/gcse.h | 2 ++
gcc/testsuite/ChangeLog.jit | 5 +++++
gcc/testsuite/jit.dg/harness.h | 2 +-
gcc/toplev.c | 2 ++
6 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/gcc/ChangeLog.jit b/gcc/ChangeLog.jit
index 5c14fcc..77ac44c 100644
--- a/gcc/ChangeLog.jit
+++ b/gcc/ChangeLog.jit
@@ -1,5 +1,13 @@
2014-03-11 David Malcolm <dmalc...@redhat.com>
+ * gcse.c (gcse_c_finalize): New, to clear test_insn between
+ in-process compiles.
+ * gcse.h (gcse_c_finalize): New.
+ * toplev.c: Include "gcse.h" so that we can...
+ (toplev_finalize): Call gcse_c_finalize.
+
+2014-03-11 David Malcolm <dmalc...@redhat.com>
+
* dwarf2out.c (dwarf2out_c_finalize): Release base_types.
2014-03-10 David Malcolm <dmalc...@redhat.com>
diff --git a/gcc/gcse.c b/gcc/gcse.c
index bb9ba15..f2409ec 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -4226,4 +4226,9 @@ make_pass_rtl_hoist (gcc::context *ctxt)
return new pass_rtl_hoist (ctxt);
}
+void gcse_c_finalize (void)
+{
+ test_insn = NULL;
+}
+
#include "gt-gcse.h"
diff --git a/gcc/gcse.h b/gcc/gcse.h
index e1dea21..f459be2 100644
--- a/gcc/gcse.h
+++ b/gcc/gcse.h
@@ -39,4 +39,6 @@ extern struct target_gcse *this_target_gcse;
#define this_target_gcse (&default_target_gcse)
#endif
+void gcse_c_finalize (void);
+
#endif
diff --git a/gcc/testsuite/ChangeLog.jit b/gcc/testsuite/ChangeLog.jit
index ec8af3d..5a84bfd 100644
--- a/gcc/testsuite/ChangeLog.jit
+++ b/gcc/testsuite/ChangeLog.jit
@@ -1,3 +1,8 @@
+2014-03-11 David Malcolm <dmalc...@redhat.com>
+
+ * jit.dg/harness.h (set_options): Increase optimization level from
+ 0 to 3.
+
2014-03-07 David Malcolm <dmalc...@redhat.com>
* jit.dg/test-functions.c (create_test_of_hidden_function): New,
diff --git a/gcc/testsuite/jit.dg/harness.h b/gcc/testsuite/jit.dg/harness.h
index aa98028..e67ac36 100644
--- a/gcc/testsuite/jit.dg/harness.h
+++ b/gcc/testsuite/jit.dg/harness.h
@@ -132,7 +132,7 @@ static void set_options (gcc_jit_context *ctxt, const char
*argv0)
gcc_jit_context_set_int_option (
ctxt,
GCC_JIT_INT_OPTION_OPTIMIZATION_LEVEL,
- 0);
+ 3);
gcc_jit_context_set_bool_option (
ctxt,
GCC_JIT_BOOL_OPTION_DEBUGINFO,
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 9de1c2d..f1ac560 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -79,6 +79,7 @@ along with GCC; see the file COPYING3. If not see
#include "pass_manager.h"
#include "dwarf2out.h"
#include "ipa-reference.h"
+#include "gcse.h"
#if defined(DBX_DEBUGGING_INFO) || defined(XCOFF_DEBUGGING_INFO)
#include "dbxout.h"
@@ -2000,6 +2001,7 @@ void toplev_finalize (void)
cgraphbuild_c_finalize ();
cgraphunit_c_finalize ();
dwarf2out_c_finalize ();
+ gcse_c_finalize ();
ipa_c_finalize ();
ipa_reference_c_finalize ();
predict_c_finalize ();
--
1.7.11.7
