Skip to content

Commit 3fd26cb

Browse files
authored
Revert "gf.c: include const-return methods in --trace-compile (#237)" (#241)
This reverts commit 11292a9.
1 parent 11292a9 commit 3fd26cb

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

src/gf.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,6 @@ JL_DLLEXPORT jl_code_instance_t *jl_get_method_inferred(
476476
return codeinst;
477477
}
478478

479-
static void record_precompile_statement(jl_method_instance_t *mi, double compilation_time, int is_const_return_abi);
480-
481479
JL_DLLEXPORT jl_code_instance_t *jl_new_codeinst(
482480
jl_method_instance_t *mi, jl_value_t *rettype,
483481
jl_value_t *inferred_const, jl_value_t *inferred,
@@ -503,10 +501,6 @@ JL_DLLEXPORT jl_code_instance_t *jl_new_codeinst(
503501
jl_atomic_store_relaxed(&codeinst->invoke, NULL);
504502
if ((const_flags & 1) != 0) {
505503
assert(const_flags & 2);
506-
if (jl_is_method(mi->def.value) && jl_isa_compileable_sig((jl_tupletype_t *)mi->specTypes, mi->sparam_vals, mi->def.method)) {
507-
// This code was freshly-inferred, so let's emit a `precompile(...)` statement for it
508-
record_precompile_statement(mi, 0.0, 1);
509-
}
510504
jl_atomic_store_relaxed(&codeinst->invoke, jl_fptr_const_return);
511505
}
512506
jl_atomic_store_relaxed(&codeinst->specsigflags, 0);
@@ -2398,7 +2392,7 @@ JL_DLLEXPORT void jl_force_trace_compile_timing_disable(void)
23982392
jl_atomic_fetch_add(&jl_force_trace_compile_timing_enabled, -1);
23992393
}
24002394

2401-
static void record_precompile_statement(jl_method_instance_t *mi, double compilation_time, int is_const_return_abi)
2395+
static void record_precompile_statement(jl_method_instance_t *mi, double compilation_time)
24022396
{
24032397
static ios_t f_precompile;
24042398
static JL_STREAM* s_precompile = NULL;
@@ -2572,7 +2566,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
25722566
codeinst->rettype_const = unspec->rettype_const;
25732567
jl_atomic_store_release(&codeinst->invoke, unspec_invoke);
25742568
jl_mi_cache_insert(mi, codeinst);
2575-
record_precompile_statement(mi, 0.0, 0);
2569+
record_precompile_statement(mi, 0);
25762570
return codeinst;
25772571
}
25782572
}
@@ -2589,7 +2583,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
25892583
0, 1, ~(size_t)0, 0, 0, jl_nothing, 0);
25902584
jl_atomic_store_release(&codeinst->invoke, jl_fptr_interpret_call);
25912585
jl_mi_cache_insert(mi, codeinst);
2592-
record_precompile_statement(mi, 0.0, 0);
2586+
record_precompile_statement(mi, 0);
25932587
return codeinst;
25942588
}
25952589
if (compile_option == JL_OPTIONS_COMPILE_OFF) {
@@ -2644,7 +2638,7 @@ jl_code_instance_t *jl_compile_method_internal(jl_method_instance_t *mi, size_t
26442638
jl_mi_cache_insert(mi, codeinst);
26452639
}
26462640
else if (did_compile) {
2647-
record_precompile_statement(mi, compile_time, 0);
2641+
record_precompile_statement(mi, compile_time);
26482642
}
26492643
jl_atomic_store_relaxed(&codeinst->precompile, 1);
26502644
return codeinst;

0 commit comments

Comments
 (0)