Skip to content

Commit

Permalink
Update toolchain.
Browse files Browse the repository at this point in the history
  • Loading branch information
sisshiki1969 committed Feb 13, 2025
1 parent ee477fc commit 1834b06
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions monoruby/src/compiler/jitgen/asmir/compile/variables.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ impl Codegen {
/// - rdi
///
pub(super) fn load_ivar_inline(&mut self, ivarid: IvarId) {
let l = self.jit.label();
let exit = self.jit.label();
monoasm! {&mut self.jit,
movq r15, [rdi + (RVALUE_OFFSET_KIND as i32 + (ivarid.get() as i32) * 8)];
// We must check whether the ivar slot is None.
testq r15, r15;
jne l;
jne exit;
movq r15, (NIL_VALUE);
l:
exit:
}
}

Expand All @@ -45,15 +45,15 @@ impl Codegen {
ivar
};
if self_ {
let l = self.jit.label();
let exit = self.jit.label();
monoasm! { &mut self.jit,
movq rdx, [rdi + (RVALUE_OFFSET_VAR as i32)];
movq rdi, [rdx + (MONOVEC_PTR)]; // ptr
movq r15, [rdi + (idx * 8)];
testq r15, r15;
jne l;
jne exit;
movq r15, (NIL_VALUE);
l:
exit:
}
} else {
let exit = self.jit.label();
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly-2025-01-05"
channel = "nightly-2025-02-11"

0 comments on commit 1834b06

Please sign in to comment.