Skip to content

Commit 57a768b

Browse files
committed
Slim debugging output
Doesn't quite work correctly yet (there's still some roots-numbering confusion), but it doesn't crash for all packages.
1 parent 0274342 commit 57a768b

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/dump.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2734,9 +2734,9 @@ static void copy_roots(jl_method_t *dest, jl_array_t *newroots)
27342734
// copy any new roots
27352735
if (newroots && dest->newrootsindex == INT32_MAX) {
27362736
assert(jl_is_array(newroots));
2737-
jl_printf(JL_STDOUT, "copying %ld roots for ", jl_array_len(newroots));
2738-
jl_(dest);
2739-
jl_printf(JL_STDOUT, "dest newrootsindex: %d; roots length %ld\n", dest->newrootsindex, dest->roots ? jl_array_len(dest->roots) : 0);
2737+
// jl_printf(JL_STDOUT, "copying %ld roots for ", jl_array_len(newroots));
2738+
// jl_(dest);
2739+
// jl_printf(JL_STDOUT, "dest newrootsindex: %d; roots length %ld\n", dest->newrootsindex, dest->roots ? jl_array_len(dest->roots) : 0);
27402740
// The roots may have references to recached items, fix that
27412741
size_t i, len = jl_array_len(newroots);
27422742
for (i = 0; i < len; i++) {
@@ -2778,7 +2778,7 @@ static void recompress_cis(jl_array_t *list)
27782778
jl_array_t *srcs = jl_alloc_vec_any(0);
27792779
for (i = 0; i < n; i++) {
27802780
jl_method_instance_t *mi = (jl_method_instance_t*)jl_array_ptr_ref(list, i);
2781-
jl_(mi);
2781+
// jl_(mi);
27822782
assert(jl_is_method_instance(mi));
27832783
jl_method_t *m = mi->def.method;
27842784
assert(jl_is_method(m));
@@ -2972,13 +2972,13 @@ static jl_value_t *_jl_restore_incremental(ios_t *f, jl_array_t *mod_array)
29722972
jl_value_t *ext_mis = jl_deserialize_value(&s, &ext_mis);
29732973
currently_deserializing = 1;
29742974
jl_printf(JL_STDOUT, "Length of ext_mis: %ld\n", jl_array_len(ext_mis));
2975-
jl_(ext_mis);
2975+
// jl_(ext_mis);
29762976
jl_printf(JL_STDOUT, "Length of flagref: %ld\n", flagref_list.len);
29772977

29782978
// get list of external generic functions
29792979
jl_value_t *external_methods = jl_deserialize_value(&s, &external_methods);
2980-
jl_printf(JL_STDOUT, "external_methods:\n");
2981-
jl_(external_methods);
2980+
// jl_printf(JL_STDOUT, "external_methods:\n");
2981+
// jl_(external_methods);
29822982
jl_printf(JL_STDOUT, "Length of flagref: %ld\n", flagref_list.len);
29832983
// check_unique(&flagref_list, 0, 2);
29842984
jl_value_t *external_backedges = jl_deserialize_value(&s, &external_backedges);
@@ -3040,9 +3040,11 @@ static jl_value_t *_jl_restore_incremental(ios_t *f, jl_array_t *mod_array)
30403040
jl_gc_enable(en); // subtyping can allocate a lot, not valid before recache-other
30413041

30423042
jl_insert_backedges((jl_array_t*)external_backedges, (jl_array_t*)external_edges); // restore external backedges (needs to be last)
3043+
jl_printf(JL_STDOUT, "Done inserting backedges\n");
30433044

30443045
// check new CodeInstances and validate any that lack external backedges
30453046
validate_new_code_instances();
3047+
jl_printf(JL_STDOUT, "Done validating code instances\n");
30463048

30473049
serializer_worklist = NULL;
30483050
htable_free(&new_code_instance_validate);

0 commit comments

Comments
 (0)