Skip to content

Commit 949caad

Browse files
vtjnashvtjnash
authored
Merge pull request #37243 from JuliaLang/jn/36462+36825
code coverage fixes
2 parents 864cea9 + 8aaf971 commit 949caad

17 files changed

+112
-70
lines changed

‎base/boot.jl

+4-3
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@
9393
#end
9494

9595
#struct LineInfoNode
96-
# method::Any
96+
# module::Module
97+
# method::Symbol
9798
# file::Symbol
9899
# line::Int
99100
# inlined_at::Int
@@ -396,8 +397,8 @@ eval(Core, :(PiNode(val, typ) = $(Expr(:new, :PiNode, :val, :typ))))
396397
eval(Core, :(PhiCNode(values::Array{Any, 1}) = $(Expr(:new, :PhiCNode, :values))))
397398
eval(Core, :(UpsilonNode(val) = $(Expr(:new, :UpsilonNode, :val))))
398399
eval(Core, :(UpsilonNode() = $(Expr(:new, :UpsilonNode))))
399-
eval(Core, :(LineInfoNode(@nospecialize(method), file::Symbol, line::Int, inlined_at::Int) =
400-
$(Expr(:new, :LineInfoNode, :method, :file, :line, :inlined_at))))
400+
eval(Core, :(LineInfoNode(mod::Module, @nospecialize(method), file::Symbol, line::Int, inlined_at::Int) =
401+
$(Expr(:new, :LineInfoNode, :mod, :method, :file, :line, :inlined_at))))
401402
eval(Core, :(CodeInstance(mi::MethodInstance, @nospecialize(rettype), @nospecialize(inferred_const),
402403
@nospecialize(inferred), const_flags::Int32,
403404
min_world::UInt, max_world::UInt) =

‎base/compiler/ssair/inlining.jl

+12-13
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ struct InliningTodo
3030
sparams::Vector{Any} # The static parameters we computed for this call site
3131
metharg # ::Type
3232
# The LineTable and IR of the inlinee
33-
linetable::Vector{LineInfoNode}
3433
ir::IRCode
3534
# If the function being inlined is a single basic block we can use a
3635
# simpler inlining algorithm. This flag determines whether that's allowed
@@ -307,8 +306,8 @@ function ir_inline_item!(compact::IncrementalCompact, idx::Int, argexprs::Vector
307306
linetable_offset::Int32 = length(linetable)
308307
# Append the linetable of the inlined function to our line table
309308
inlined_at = Int(compact.result[idx][:line])
310-
for entry in item.linetable
311-
push!(linetable, LineInfoNode(entry.method, entry.file, entry.line,
309+
for entry in item.ir.linetable
310+
push!(linetable, LineInfoNode(entry.module, entry.method, entry.file, entry.line,
312311
(entry.inlined_at > 0 ? entry.inlined_at + linetable_offset : inlined_at)))
313312
end
314313
if item.isva
@@ -735,23 +734,23 @@ function analyze_method!(idx::Int, atypes::Vector{Any}, match::MethodMatch,
735734

736735
@timeit "inline IR inflation" begin
737736
ir2 = inflate_ir(src, mi)
738-
# prepare inlining linetable with method instance information
739-
inline_linetable = Vector{LineInfoNode}(undef, length(src.linetable))
740-
for i = 1:length(src.linetable)
741-
entry = src.linetable[i]
742-
if entry.inlined_at === 0 && entry.method === method
743-
entry = LineInfoNode(mi, entry.file, entry.line, entry.inlined_at)
744-
end
745-
inline_linetable[i] = entry
746-
end
737+
# #optional: prepare inlining linetable with method instance information
738+
# inline_linetable = ir2.linetable
739+
# for i = 1:length(inline_linetable)
740+
# entry = inline_linetable[i]
741+
# if entry.inlined_at === 0 && entry.method === method
742+
# entry = LineInfoNode(entry.module, mi, entry.file, entry.line, entry.inlined_at)
743+
# inline_linetable[i] = entry
744+
# end
745+
# end
747746
end
748747
#verify_ir(ir2)
749748

750749
return InliningTodo(idx,
751750
na > 0 && method.isva,
752751
isinvoke, na,
753752
method, Any[match.sparams...], match.spec_types,
754-
inline_linetable, ir2, linear_inline_eligible(ir2))
753+
ir2, linear_inline_eligible(ir2))
755754
end
756755

757756
# Neither the product iterator not CartesianIndices are available

‎base/compiler/typeinfer.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ function typeinf_ext(interp::AbstractInterpreter, mi::MethodInstance)
592592
tree.slotflags = fill(0x00, nargs)
593593
tree.ssavaluetypes = 1
594594
tree.codelocs = Int32[1]
595-
tree.linetable = [LineInfoNode(method, method.file, Int(method.line), 0)]
595+
tree.linetable = [LineInfoNode(method.module, method.name, method.file, Int(method.line), 0)]
596596
tree.inferred = true
597597
tree.ssaflags = UInt8[0]
598598
tree.pure = true

‎src/ast.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ static jl_value_t *scm_to_julia_(fl_context_t *fl_ctx, value_t e, jl_module_t *m
599599
else if (sym == thunk_sym) {
600600
ex = scm_to_julia_(fl_ctx, car_(e), mod);
601601
assert(jl_is_code_info(ex));
602-
jl_linenumber_to_lineinfo((jl_code_info_t*)ex, (jl_value_t*)jl_symbol("top-level scope"));
602+
jl_linenumber_to_lineinfo((jl_code_info_t*)ex, mod, (jl_value_t*)jl_symbol("top-level scope"));
603603
temp = (jl_value_t*)jl_exprn(sym, 1);
604604
jl_exprargset(temp, 0, ex);
605605
}

‎src/codegen.cpp

+30-19
Original file line numberDiff line numberDiff line change
@@ -5649,8 +5649,8 @@ static std::pair<std::unique_ptr<Module>, jl_llvm_functions_t>
56495649
}
56505650
else if (jl_array_len(src->linetable) > 0) {
56515651
jl_value_t *locinfo = jl_array_ptr_ref(src->linetable, 0);
5652-
ctx.file = jl_symbol_name((jl_sym_t*)jl_fieldref_noalloc(locinfo, 1));
5653-
toplineno = jl_unbox_long(jl_fieldref(locinfo, 2));
5652+
ctx.file = jl_symbol_name((jl_sym_t*)jl_fieldref_noalloc(locinfo, 2));
5653+
toplineno = jl_unbox_long(jl_fieldref(locinfo, 3));
56545654
}
56555655
if (ctx.file.empty())
56565656
ctx.file = "<missing>";
@@ -6268,40 +6268,44 @@ static std::pair<std::unique_ptr<Module>, jl_llvm_functions_t>
62686268
ssize_t line;
62696269
bool is_user_code;
62706270
unsigned inlined_at;
6271+
bool operator ==(const DebugLineTable &other) const {
6272+
return other.loc == loc && other.file == file && other.line == line && other.is_user_code == is_user_code && other.inlined_at == inlined_at;
6273+
}
62716274
};
62726275
std::vector<DebugLineTable> linetable;
6273-
{
6276+
{ // populate the linetable data format
62746277
assert(jl_is_array(src->linetable));
62756278
size_t nlocs = jl_array_len(src->linetable);
62766279
std::map<std::tuple<StringRef, StringRef>, DISubprogram*> subprograms;
62776280
linetable.resize(nlocs + 1);
6281+
DebugLineTable &topinfo = linetable[0];
6282+
topinfo.file = ctx.file;
6283+
topinfo.line = toplineno;
6284+
topinfo.is_user_code = mod_is_user_mod;
6285+
topinfo.inlined_at = 0;
6286+
topinfo.loc = topdebugloc;
62786287
for (size_t i = 0; i < nlocs; i++) {
62796288
// LineInfoNode(mod::Module, method::Any, file::Symbol, line::Int, inlined_at::Int)
62806289
jl_value_t *locinfo = jl_array_ptr_ref(src->linetable, i);
62816290
DebugLineTable &info = linetable[i + 1];
62826291
assert(jl_typeis(locinfo, jl_lineinfonode_type));
6283-
jl_value_t *method = jl_fieldref_noalloc(locinfo, 0);
6284-
if (jl_is_method_instance(method))
6285-
method = ((jl_method_instance_t*)method)->def.value;
6286-
jl_sym_t *filesym = (jl_sym_t*)jl_fieldref_noalloc(locinfo, 1);
6287-
info.line = jl_unbox_long(jl_fieldref(locinfo, 2));
6288-
info.inlined_at = jl_unbox_long(jl_fieldref(locinfo, 3));
6292+
jl_module_t *module = (jl_module_t*)jl_fieldref_noalloc(locinfo, 0);
6293+
jl_value_t *method = jl_fieldref_noalloc(locinfo, 1);
6294+
jl_sym_t *filesym = (jl_sym_t*)jl_fieldref_noalloc(locinfo, 2);
6295+
info.line = jl_unbox_long(jl_fieldref(locinfo, 3));
6296+
info.inlined_at = jl_unbox_long(jl_fieldref(locinfo, 4));
62896297
assert(info.inlined_at <= i);
6290-
if (jl_is_method(method)) {
6291-
jl_module_t *module = ((jl_method_t*)method)->module;
6292-
if (module == ctx.module)
6293-
info.is_user_code = mod_is_user_mod;
6294-
else
6295-
info.is_user_code = in_user_mod(module);
6296-
}
6297-
else {
6298-
info.is_user_code = (info.inlined_at == 0) ? mod_is_user_mod : linetable.at(info.inlined_at).is_user_code;
6299-
}
6298+
if (module == ctx.module)
6299+
info.is_user_code = mod_is_user_mod;
6300+
else
6301+
info.is_user_code = in_user_mod(module);
63006302
info.file = jl_symbol_name(filesym);
63016303
if (info.file.empty())
63026304
info.file = "<missing>";
63036305
if (ctx.debug_enabled) {
63046306
StringRef fname;
6307+
if (jl_is_method_instance(method))
6308+
method = ((jl_method_instance_t*)method)->def.value;
63056309
if (jl_is_method(method))
63066310
method = (jl_value_t*)((jl_method_t*)method)->name;
63076311
if (jl_is_symbol(method))
@@ -6512,6 +6516,13 @@ static std::pair<std::unique_ptr<Module>, jl_llvm_functions_t>
65126516
Value *sync_bytes = nullptr;
65136517
if (do_malloc_log(true))
65146518
sync_bytes = ctx.builder.CreateCall(prepare_call(diff_gc_total_bytes_func), {});
6519+
{ // coverage for the function definition line number
6520+
const auto &topinfo = linetable.at(0);
6521+
if (topinfo == linetable.at(1))
6522+
current_lineinfo.push_back(1);
6523+
if (do_coverage(topinfo.is_user_code))
6524+
coverageVisitLine(ctx, topinfo.file, topinfo.line);
6525+
}
65156526

65166527
find_next_stmt(0);
65176528
while (cursor != -1) {

‎src/dump.c

+1-9
Original file line numberDiff line numberDiff line change
@@ -1660,7 +1660,7 @@ static jl_value_t *jl_deserialize_value(jl_serializer_state *s, jl_value_t **loc
16601660
{
16611661
assert(!ios_eof(s->s));
16621662
jl_value_t *v;
1663-
size_t i, n;
1663+
size_t n;
16641664
uintptr_t pos;
16651665
uint8_t tag = read_uint8(s->s);
16661666
if (tag > LAST_TAG)
@@ -1778,14 +1778,6 @@ static jl_value_t *jl_deserialize_value(jl_serializer_state *s, jl_value_t **loc
17781778
arraylist_push(&backref_list, v);
17791779
ios_readall(s->s, jl_string_data(v), n);
17801780
return v;
1781-
case TAG_LINEINFO:
1782-
v = jl_new_struct_uninit(jl_lineinfonode_type);
1783-
arraylist_push(&backref_list, v);
1784-
for (i = 0; i < jl_datatype_nfields(jl_lineinfonode_type); i++) {
1785-
size_t offs = jl_field_offset(jl_lineinfonode_type, i);
1786-
set_nth_field(jl_lineinfonode_type, (void*)v, i, jl_deserialize_value(s, (jl_value_t**)((char*)v + offs)));
1787-
}
1788-
return v;
17891781
case TAG_DATATYPE:
17901782
pos = backref_list.len;
17911783
arraylist_push(&backref_list, NULL);

‎src/jltypes.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -2181,8 +2181,9 @@ void jl_init_types(void) JL_GC_DISABLED
21812181

21822182
jl_lineinfonode_type =
21832183
jl_new_datatype(jl_symbol("LineInfoNode"), core, jl_any_type, jl_emptysvec,
2184-
jl_perm_symsvec(4, "method", "file", "line", "inlined_at"),
2185-
jl_svec(4, jl_any_type, jl_symbol_type, jl_long_type, jl_long_type), 0, 0, 4);
2184+
jl_perm_symsvec(5, "module", "method", "file", "line", "inlined_at"),
2185+
jl_svec(5, jl_module_type, jl_any_type, jl_symbol_type, jl_long_type, jl_long_type),
2186+
0, 0, 5);
21862187

21872188
jl_gotonode_type =
21882189
jl_new_datatype(jl_symbol("GotoNode"), core, jl_any_type, jl_emptysvec,

‎src/julia.h

+1
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ JL_EXTENSION typedef union {
252252
typedef struct _jl_method_instance_t jl_method_instance_t;
253253

254254
typedef struct _jl_line_info_node_t {
255+
struct _jl_module_t *module;
255256
jl_value_t *method;
256257
jl_sym_t *file;
257258
intptr_t line;

‎src/julia_internal.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ jl_value_t *jl_interpret_toplevel_expr_in(jl_module_t *m, jl_value_t *e,
490490
jl_svec_t *sparam_vals);
491491
int jl_is_toplevel_only_expr(jl_value_t *e) JL_NOTSAFEPOINT;
492492
jl_value_t *jl_call_scm_on_ast(const char *funcname, jl_value_t *expr, jl_module_t *inmodule);
493-
void jl_linenumber_to_lineinfo(jl_code_info_t *ci, jl_value_t *name);
493+
void jl_linenumber_to_lineinfo(jl_code_info_t *ci, jl_module_t *mod, jl_value_t *name);
494494

495495
jl_method_instance_t *jl_method_lookup(jl_value_t **args, size_t nargs, size_t world);
496496
jl_value_t *jl_gf_invoke(jl_value_t *types, jl_value_t *f, jl_value_t **args, size_t nargs);

‎src/method.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ jl_code_info_t *jl_new_code_info_from_ir(jl_expr_t *ir)
356356
return src;
357357
}
358358

359-
void jl_linenumber_to_lineinfo(jl_code_info_t *ci, jl_value_t *name)
359+
void jl_linenumber_to_lineinfo(jl_code_info_t *ci, jl_module_t *mod, jl_value_t *name)
360360
{
361361
jl_array_t *li = (jl_array_t*)ci->linetable;
362362
size_t i, n = jl_array_len(li);
@@ -366,11 +366,11 @@ void jl_linenumber_to_lineinfo(jl_code_info_t *ci, jl_value_t *name)
366366
jl_value_t *ln = jl_array_ptr_ref(li, i);
367367
if (jl_is_linenode(ln)) {
368368
rt = jl_box_long(jl_linenode_line(ln));
369-
rt = jl_new_struct(jl_lineinfonode_type, name, jl_linenode_file(ln), rt, jl_box_long(0));
369+
rt = jl_new_struct(jl_lineinfonode_type, mod, name, jl_linenode_file(ln), rt, jl_box_long(0));
370370
jl_array_ptr_set(li, i, rt);
371371
}
372372
else if (jl_is_expr(ln) && ((jl_expr_t*)ln)->head == line_sym && jl_expr_nargs(ln) == 3) {
373-
rt = jl_new_struct(jl_lineinfonode_type, jl_symbol("macro expansion"),
373+
rt = jl_new_struct(jl_lineinfonode_type, mod, jl_symbol("macro expansion"),
374374
jl_exprarg(ln, 1), jl_exprarg(ln, 0), jl_exprarg(ln, 2));
375375
jl_array_ptr_set(li, i, rt);
376376
}
@@ -461,7 +461,7 @@ JL_DLLEXPORT jl_code_info_t *jl_code_for_staged(jl_method_instance_t *linfo)
461461
ptls->in_pure_callback = last_in;
462462
jl_lineno = last_lineno;
463463
ptls->world_age = last_age;
464-
jl_linenumber_to_lineinfo(func, (jl_value_t*)def->name);
464+
jl_linenumber_to_lineinfo(func, def->module, (jl_value_t*)def->name);
465465
}
466466
JL_CATCH {
467467
ptls->in_pure_callback = last_in;
@@ -514,7 +514,7 @@ static void jl_method_set_source(jl_method_t *m, jl_code_info_t *src)
514514
}
515515
m->called = called;
516516
m->pure = src->pure;
517-
jl_linenumber_to_lineinfo(src, (jl_value_t*)m->name);
517+
jl_linenumber_to_lineinfo(src, m->module, (jl_value_t*)m->name);
518518

519519
jl_array_t *copy = NULL;
520520
jl_svec_t *sparam_vars = jl_outer_unionall_vars(m->sig);

‎src/stackwalk.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -660,14 +660,14 @@ void jl_print_bt_entry_codeloc(jl_bt_element_t *bt_entry) JL_NOTSAFEPOINT
660660
jl_line_info_node_t *locinfo = (jl_line_info_node_t*)
661661
jl_array_ptr_ref(src->linetable, debuginfoloc - 1);
662662
assert(jl_typeis(locinfo, jl_lineinfonode_type));
663+
const char *func_name = "Unknown";
663664
jl_value_t *method = locinfo->method;
664-
if (jl_is_method_instance(method)) {
665+
if (jl_is_method_instance(method))
665666
method = ((jl_method_instance_t*)method)->def.value;
666-
if (jl_is_method(method))
667-
method = (jl_value_t*)((jl_method_t*)method)->name;
668-
}
669-
const char *func_name = jl_is_symbol(method) ?
670-
jl_symbol_name((jl_sym_t*)method) : "Unknown";
667+
if (jl_is_method(method))
668+
method = (jl_value_t*)((jl_method_t*)method)->name;
669+
if (jl_is_symbol(method))
670+
func_name = jl_symbol_name((jl_sym_t*)method);
671671
jl_safe_print_codeloc(func_name, jl_symbol_name(locinfo->file),
672672
locinfo->line, locinfo->inlined_at);
673673
debuginfoloc = locinfo->inlined_at;

‎stdlib/Serialization/src/Serialization.jl

+8-5
Original file line numberDiff line numberDiff line change
@@ -1038,12 +1038,15 @@ function deserialize(s::AbstractSerializer, ::Type{Core.MethodInstance})
10381038
end
10391039

10401040
function deserialize(s::AbstractSerializer, ::Type{Core.LineInfoNode})
1041-
_meth = deserialize(s)
1042-
if _meth isa Module
1043-
# pre v1.2, skip
1044-
_meth = deserialize(s)
1041+
mod = deserialize(s)
1042+
if mod isa Module
1043+
method = deserialize(s)
1044+
else
1045+
# files post v1.2 and pre v1.6 are broken
1046+
method = mod
1047+
mod = Main
10451048
end
1046-
return Core.LineInfoNode(_meth::Symbol, deserialize(s)::Symbol, deserialize(s)::Int, deserialize(s)::Int)
1049+
return Core.LineInfoNode(mod, method, deserialize(s)::Symbol, deserialize(s)::Int, deserialize(s)::Int)
10471050
end
10481051

10491052
function deserialize(s::AbstractSerializer, ::Type{PhiNode})

‎test/cmdlineargs.jl

+6-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,9 @@ let exename = `$(Base.julia_cmd()) --startup-file=no`
258258
mktempdir() do dir
259259
helperdir = joinpath(@__DIR__, "testhelpers")
260260
inputfile = joinpath(helperdir, "coverage_file.jl")
261-
expected = replace(read(joinpath(helperdir, "coverage_file.info"), String),
261+
expected = replace(read(joinpath(helperdir, "coverage_file.info.bad"), String),
262+
"<FILENAME>" => realpath(inputfile))
263+
expected_good = replace(read(joinpath(helperdir, "coverage_file.info"), String),
262264
"<FILENAME>" => realpath(inputfile))
263265
covfile = replace(joinpath(dir, "coverage.info"), "%" => "%%")
264266
@test !isfile(covfile)
@@ -276,18 +278,21 @@ let exename = `$(Base.julia_cmd()) --startup-file=no`
276278
got = read(covfile, String)
277279
rm(covfile)
278280
@test occursin(expected, got) || (expected, got)
281+
@test_broken occursin(expected_good, got)
279282
@test readchomp(`$exename -E "Base.JLOptions().code_coverage" -L $inputfile
280283
--code-coverage=$covfile --code-coverage=user`) == "1"
281284
@test isfile(covfile)
282285
got = read(covfile, String)
283286
rm(covfile)
284287
@test occursin(expected, got) || (expected, got)
288+
@test_broken occursin(expected_good, got)
285289
@test readchomp(`$exename -E "Base.JLOptions().code_coverage" -L $inputfile
286290
--code-coverage=$covfile --code-coverage=all`) == "2"
287291
@test isfile(covfile)
288292
got = read(covfile, String)
289293
rm(covfile)
290294
@test occursin(expected, got) || (expected, got)
295+
@test_broken occursin(expected_good, got)
291296
end
292297

293298
# --track-allocation

‎test/compiler/ssair.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ end
3636
# false, false, false, false
3737
# ))
3838
#
39-
# NullLineInfo = Core.LineInfoNode(Symbol(""), Symbol(""), 0, 0)
39+
# NullLineInfo = Core.LineInfoNode(Main, Symbol(""), Symbol(""), 0, 0)
4040
# Compiler.run_passes(ci, 1, [NullLineInfo])
4141
# # XXX: missing @test
4242
#end

‎test/testhelpers/coverage_file.info

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
SF:<FILENAME>
2+
DA:3,1
23
DA:4,1
34
DA:5,0
45
DA:7,1
@@ -8,6 +9,9 @@ DA:11,1
89
DA:12,1
910
DA:14,0
1011
DA:17,1
11-
LH:7
12-
LF:9
12+
DA:19,1
13+
DA:20,1
14+
DA:22,1
15+
LH:10
16+
LF:13
1317
end_of_record

‎test/testhelpers/coverage_file.info.bad

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
SF:<FILENAME>
2+
DA:3,1
3+
DA:4,1
4+
DA:5,0
5+
DA:7,1
6+
DA:8,1
7+
DA:9,5
8+
DA:11,1
9+
DA:12,1
10+
DA:14,0
11+
DA:17,1
12+
DA:18,0
13+
DA:19,1
14+
DA:20,1
15+
DA:22,1
16+
DA:1234,0
17+
LH:11
18+
LF:15
19+
end_of_record

0 commit comments

Comments
 (0)