Skip to content

Commit 354da5e

Browse files
committed
ZJIT: Restore original comment wording to minimize diff
1 parent 5ba6c0b commit 354da5e

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

zjit/src/hir.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7584,13 +7584,13 @@ pub fn iseq_to_hir(iseq: *const rb_iseq_t) -> Result<Function, ParseError> {
75847584
fun.push_insn(block, Insn::IfTrue { val: is_modified, target: BranchEdge { target: modified_block, args: vec![] }});
75857585
fun.push_insn(block, Insn::Jump(BranchEdge { target: unmodified_block, args: vec![] }));
75867586

7587-
// Modified block: load the block local via EP.
7587+
// Push modified block: load the block local via EP.
75887588
let modified_val = fun.get_local_from_ep(modified_block, ep, ep_offset, level, types::BasicObject);
75897589
let mut modified_args = vec![modified_val];
75907590
if level == 0 { modified_args.push(modified_val); }
75917591
fun.push_insn(modified_block, Insn::Jump(BranchEdge { target: join_block, args: modified_args }));
75927592

7593-
// Unmodified block: inspect the current block handler to
7593+
// Push unmodified block: inspect the current block handler to
75947594
// decide whether this path returns `nil` or `BlockParamProxy`.
75957595
let block_handler = fun.push_insn(unmodified_block, Insn::LoadField { recv: ep, id: ID!(_env_data_index_specval), offset: SIZEOF_VALUE_I32 * VM_ENV_DATA_INDEX_SPECVAL, return_type: types::CInt64 });
75967596
let original_local = if level == 0 { Some(state.getlocal(ep_offset)) } else { None };
@@ -7621,7 +7621,8 @@ pub fn iseq_to_hir(iseq: *const rb_iseq_t) -> Result<Function, ParseError> {
76217621
}
76227622
}
76237623

7624-
// Continue from the join block
7624+
// Continue compilation from the merged continuation block at the next
7625+
// instruction.
76257626
if let Some(local_param) = join_local {
76267627
state.setlocal(ep_offset, local_param);
76277628
}
@@ -7652,19 +7653,19 @@ pub fn iseq_to_hir(iseq: *const rb_iseq_t) -> Result<Function, ParseError> {
76527653
args: vec![],
76537654
}));
76547655

7655-
// Modified block: read Proc from EP.
7656+
// Push modified block: read Proc from EP.
76567657
let modified_val = fun.get_local_from_ep(modified_block, ep, ep_offset, level, types::BasicObject);
76577658
fun.push_insn(modified_block, Insn::Jump(BranchEdge { target: join_block, args: vec![modified_val] }));
76587659

7659-
// Unmodified block: convert block handler to Proc.
7660+
// Push unmodified block: convert block handler to Proc.
76607661
let unmodified_val = fun.push_insn(unmodified_block, Insn::GetBlockParam {
76617662
ep_offset,
76627663
level,
76637664
state: exit_id,
76647665
});
76657666
fun.push_insn(unmodified_block, Insn::Jump(BranchEdge { target: join_block, args: vec![unmodified_val] }));
76667667

7667-
// Continue from the join block
7668+
// Continue compilation from the join block at the next instruction.
76687669
if level == 0 {
76697670
state.setlocal(ep_offset, join_param);
76707671
}

0 commit comments

Comments
 (0)