diff options
author | Kevin Newton <kddnewton@gmail.com> | 2022-08-18 15:40:15 -0400 |
---|---|---|
committer | Takashi Kokubun <takashikkbn@gmail.com> | 2022-08-29 09:09:41 -0700 |
commit | 932885244ecb62b22904b9d9842fb7f2be5b7d00 (patch) | |
tree | 460b2a192d23c0f6a181e78ff2c0bd46710fe338 /yjit | |
parent | d5fe9e1d9aabacb7bafe97dbbc63b0272be84dee (diff) |
Better variable name, no must_use on ccall (https://github.com/Shopify/ruby/pull/424)
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6289
Diffstat (limited to 'yjit')
-rw-r--r-- | yjit/src/backend/arm64/mod.rs | 4 | ||||
-rw-r--r-- | yjit/src/backend/ir.rs | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/yjit/src/backend/arm64/mod.rs b/yjit/src/backend/arm64/mod.rs index 60cdf2b9d1..3f1bbf99b0 100644 --- a/yjit/src/backend/arm64/mod.rs +++ b/yjit/src/backend/arm64/mod.rs @@ -234,7 +234,7 @@ impl Assembler // such that only the Op::Load instruction needs to handle that // case. If the values aren't heap objects then we'll treat them as // if they were just unsigned integer. - let skip_load = matches!(insn, Insn::Load { .. }); + let is_load = matches!(insn, Insn::Load { .. }); let mut opnd_iter = insn.opnd_iter_mut(); while let Some(opnd) = opnd_iter.next() { @@ -242,7 +242,7 @@ impl Assembler Opnd::Value(value) => { if value.special_const_p() { *opnd = Opnd::UImm(value.as_u64()); - } else if !skip_load { + } else if !is_load { *opnd = asm.load(*opnd); } }, diff --git a/yjit/src/backend/ir.rs b/yjit/src/backend/ir.rs index fe525cf31d..4a7bea8dac 100644 --- a/yjit/src/backend/ir.rs +++ b/yjit/src/backend/ir.rs @@ -1234,7 +1234,6 @@ impl Assembler { self.push_insn(Insn::Breakpoint); } - #[must_use] pub fn ccall(&mut self, fptr: *const u8, opnds: Vec<Opnd>) -> Opnd { let out = self.next_opnd_out(Opnd::match_num_bits(&opnds)); self.push_insn(Insn::CCall { target: Target::FunPtr(fptr), opnds, out }); |