Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/zjit-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
rustup install ${{ matrix.rust_version }} --profile minimal
rustup default ${{ matrix.rust_version }}

- uses: taiki-e/install-action@920ab1831fbf4fb3ef75c8ead83556c918bb7290 # v2.79.8
- uses: taiki-e/install-action@8f531eaecd1898bc3da7d104ad91bee98d1b97bd # v2.79.9
with:
tool: nextest@0.9
if: ${{ matrix.test_task == 'zjit-check' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zjit-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
ruby-version: '3.1'
bundler: none

- uses: taiki-e/install-action@920ab1831fbf4fb3ef75c8ead83556c918bb7290 # v2.79.8
- uses: taiki-e/install-action@8f531eaecd1898bc3da7d104ad91bee98d1b97bd # v2.79.9
with:
tool: nextest@0.9
if: ${{ matrix.test_task == 'zjit-check' }}
Expand Down
4 changes: 2 additions & 2 deletions test/ruby/test_hash.rb
Original file line number Diff line number Diff line change
Expand Up @@ -465,10 +465,10 @@ def test_each_pair
def test_each_value
res = []
@cls[].each_value { |v| res << v }
assert_equal(0, [].length)
assert_equal(0, res.length)

@h.each_value { |v| res << v }
assert_equal(0, [].length)
assert_equal(@h.size, res.length)

expected = []
@h.each { |k, v| expected << v }
Expand Down
6 changes: 2 additions & 4 deletions zjit/src/backend/arm64/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -409,17 +409,16 @@ impl Assembler {
// if they were just unsigned integer.
let is_load = matches!(insn, Insn::Load { .. } | Insn::LoadInto { .. });
let is_jump = insn.is_jump();
let mut opnd_iter = insn.opnd_iter_mut();

while let Some(opnd) = opnd_iter.next() {
insn.for_each_operand_mut(|opnd| {
if let Opnd::Value(value) = opnd {
if value.special_const_p() {
*opnd = Opnd::UImm(value.as_u64());
} else if !is_load && !is_jump {
*opnd = asm.load(*opnd);
}
};
}
});

// We are replacing instructions here so we know they are already
// being used. It is okay not to use their output here.
Expand Down Expand Up @@ -1587,7 +1586,6 @@ impl Assembler {
Insn::CSelGE { truthy, falsy, out } => {
csel(cb, out.into(), truthy.into(), falsy.into(), Condition::GE);
}
Insn::LiveReg { .. } => (), // just a reg alloc signal, no code
};

insn_idx += 1;
Expand Down
Loading