Skip to content

Commit 411732e

Browse files
committed
vm: If there's no lineno info, set lineno in traceback to 0, not 1.
To clearly signify that lineno is not known.
1 parent b8f117d commit 411732e

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

py/vm.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -1042,12 +1042,16 @@ mp_vm_return_kind_t mp_execute_bytecode2(mp_code_state *code_state, volatile mp_
10421042
machine_uint_t code_info_size = code_info[0] | (code_info[1] << 8) | (code_info[2] << 16) | (code_info[3] << 24);
10431043
qstr source_file = code_info[4] | (code_info[5] << 8) | (code_info[6] << 16) | (code_info[7] << 24);
10441044
qstr block_name = code_info[8] | (code_info[9] << 8) | (code_info[10] << 16) | (code_info[11] << 24);
1045-
machine_uint_t source_line = 1;
1045+
machine_uint_t source_line = 0;
10461046
machine_uint_t bc = code_state->ip - code_info - code_info_size;
10471047
//printf("find %lu %d %d\n", bc, code_info[12], code_info[13]);
1048-
for (const byte* ci = code_info + 12; *ci && bc >= ((*ci) & 31); ci++) {
1049-
bc -= *ci & 31;
1050-
source_line += *ci >> 5;
1048+
const byte* ci = code_info + 12;
1049+
if (*ci) {
1050+
source_line = 1;
1051+
for (; *ci && bc >= ((*ci) & 31); ci++) {
1052+
bc -= *ci & 31;
1053+
source_line += *ci >> 5;
1054+
}
10511055
}
10521056
mp_obj_exception_add_traceback(nlr.ret_val, source_file, source_line, block_name);
10531057
}

0 commit comments

Comments
 (0)