Skip to content

Commit bcb29e6

Browse files
committed
Clean up autoformatting damage
1 parent 8d4e125 commit bcb29e6

3 files changed

Lines changed: 332 additions & 677 deletions

File tree

zjit/src/codegen.rs

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ pub extern "C" fn rb_zjit_count_side_exit(payload_raw: *mut std::ffi::c_void) {
5858
return;
5959
}
6060
let payload = unsafe { &mut *(payload_raw as *mut IseqPayload) };
61-
if let RecompileAction::Recompile { preserve_profiles } = payload
62-
.recompile
63-
.on_signal(RecompileSignal::SideExit, payload.versions.len())
61+
if let RecompileAction::Recompile { preserve_profiles } =
62+
payload.recompile.on_signal(RecompileSignal::SideExit, payload.versions.len())
6463
{
6564
let iseq = match payload.versions.last() {
6665
Some(version_ref) => unsafe { version_ref.as_ref() }.iseq,
@@ -177,9 +176,8 @@ pub extern "C" fn rb_zjit_count_ivar_fallback(payload_raw: *mut std::ffi::c_void
177176
}
178177
let payload = unsafe { &mut *(payload_raw as *mut IseqPayload) };
179178

180-
if let RecompileAction::Recompile { preserve_profiles } = payload
181-
.recompile
182-
.on_signal(RecompileSignal::IvarFallback, payload.versions.len())
179+
if let RecompileAction::Recompile { preserve_profiles } =
180+
payload.recompile.on_signal(RecompileSignal::IvarFallback, payload.versions.len())
183181
{
184182
let iseq = match payload.versions.last() {
185183
Some(version_ref) => unsafe { version_ref.as_ref() }.iseq,
@@ -376,12 +374,7 @@ fn gen_iseq_entry_point(
376374
{
377375
let payload = get_or_create_iseq_payload(iseq);
378376
let call_threshold = unsafe { crate::options::rb_zjit_call_threshold as u32 };
379-
match payload.recompile.on_signal(
380-
RecompileSignal::Entry {
381-
credit: call_threshold,
382-
},
383-
payload.versions.len(),
384-
) {
377+
match payload.recompile.on_signal(RecompileSignal::Entry { credit: call_threshold }, payload.versions.len()) {
385378
RecompileAction::DeferToInterpreter => {
386379
unsafe { rb_iseq_reset_jit_func(iseq) };
387380
return Err(CompileError::DeferredForReprofiling);
@@ -408,10 +401,7 @@ fn gen_iseq_entry_point(
408401
let (no_profile_sends, total_sends) = function.count_no_profile_sends();
409402
let sends_need_deferral = total_sends > 0 && no_profile_sends * 4 > total_sends;
410403
let has_unresolved = sends_need_deferral || function.has_not_monomorphic_ivars();
411-
if let RecompileAction::Defer = payload
412-
.recompile
413-
.post_hir_check(is_recompile, has_unresolved)
414-
{
404+
if let RecompileAction::Defer = payload.recompile.post_hir_check(is_recompile, has_unresolved) {
415405
payload.profile.reset_counters_for_recompile();
416406
unsafe { rb_zjit_profile_enable(iseq) };
417407
unsafe { rb_iseq_reset_jit_func(iseq) };
@@ -2675,8 +2665,7 @@ fn gen_guarded_inline_profile(
26752665

26762666
asm_comment!(asm, "guard: skip inline profiling if self-disabled");
26772667
let payload_addr = asm.load(Opnd::UImm(jit.payload_ptr as u64));
2678-
let offset = (std::mem::offset_of!(crate::payload::IseqPayload, recompile)
2679-
+ std::mem::offset_of!(RecompileState, no_profile_send_hits)) as i32;
2668+
let offset = (std::mem::offset_of!(crate::payload::IseqPayload, recompile) + std::mem::offset_of!(RecompileState, no_profile_send_hits)) as i32;
26802669
let hits = asm.load(Opnd::mem(64, payload_addr, offset));
26812670
asm.cmp(hits, Opnd::UImm(threshold));
26822671
asm.jge(jit, skip_edge());

0 commit comments

Comments
 (0)