Skip to content

Insert locations when running ruby. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vext01 merged 1 commit into from
Sep 19, 2025
+26 −21
Merged

Insert locations when running ruby. #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,30 @@ static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NOD
#define IS_NEXT_INSN_ID(link, insn) \
((link)->next && IS_INSN((link)->next) && IS_INSN_ID((link)->next, insn))

void yk_generate_locations(struct rb_iseq_constant_body *body) {
body->yklocs = calloc(body->iseq_size, sizeof(YkLocation));
unsigned long pos = 0;
while (pos < body->iseq_size) {
int opcode = rb_vm_insn_addr2opcode((void *)body->iseq_encoded[pos]);
const VALUE instr = body->iseq_encoded[pos];
switch(instr) {
case BIN(branchif):
; long dst = body->iseq_encoded[pos+1];
if (dst < 0) {
// Add a new location to backwards branches.
body->yklocs[pos] = yk_location_new();
} else {
body->yklocs[pos] = yk_location_null();
}
break;
default:
body->yklocs[pos] = yk_location_null();
break;
}
pos = pos + insn_len(opcode);
}
}

/* error */
#if CPDEBUG > 0
RBIMPL_ATTR_NORETURN()
Expand Down Expand Up @@ -2837,27 +2861,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
body->iseq_encoded = (void *)generated_iseq;
body->iseq_size = code_index;
body->stack_max = stack_max;
body->yklocs = calloc(code_index, sizeof(YkLocation));
int pos = 0;
while (pos < code_index) {
int opcode = rb_vm_insn_addr2opcode((void *)body->iseq_encoded[pos]);
const VALUE instr = body->iseq_encoded[pos];
switch(instr) {
case BIN(branchif):
; int dst = body->iseq_encoded[pos+1];
if (dst < 0) {
// Add a new location to backwards branches.
body->yklocs[pos] = yk_location_new();
} else {
body->yklocs[pos] = yk_location_null();
}
break;
default:
body->yklocs[pos] = yk_location_null();
break;
}
pos = pos + insn_len(opcode);
}
yk_generate_locations(body);

if (ISEQ_COMPILE_DATA(iseq)->is_single_mark_bit) {
body->mark_bits.single = ISEQ_COMPILE_DATA(iseq)->mark_bits.single;
Expand Down Expand Up @@ -13075,6 +13079,7 @@ ibf_load_code(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t bytecod

load_body->iseq_encoded = code;
load_body->iseq_size = code_index;
yk_generate_locations(load_body);

if (ISEQ_MBITS_BUFLEN(load_body->iseq_size) == 1) {
load_body->mark_bits.single = mark_offset_bits[0];
Expand Down