Skip to content

compile.c: Handle anonymous variables in outer_variable_cmp #13436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
byroot merged 1 commit into from
Jun 2, 2025
Merged

compile.c: Handle anonymous variables in outer_variable_cmp #13436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
compile.c: Handle anonymous variables in outer_variable_cmp 
[Bug #21370]
  • Loading branch information
@byroot
byroot committed Jun 2, 2025
commit 2d6f8e9c94174bdae778cf1ea029edcc42bbf00d
7 changes: 7 additions & 0 deletions compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13378,6 +13378,13 @@ outer_variable_cmp(const void *a, const void *b, void *arg)
{
const struct outer_variable_pair *ap = (const struct outer_variable_pair *)a;
const struct outer_variable_pair *bp = (const struct outer_variable_pair *)b;

if (!ap->name) {
return -1;
} else if (!bp->name) {
return 1;
}

return rb_str_cmp(ap->name, bp->name);
}

Expand Down
19 changes: 19 additions & 0 deletions test/ruby/test_iseq.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,25 @@ def test_unreachable_next_in_block
end
end

def test_serialize_anonymous_outer_variables
iseq = RubyVM::InstructionSequence.compile(<<~'RUBY')
obj = Object.new
def obj.test
[1].each do
raise "Oops"
rescue
return it
end
end
obj
RUBY

binary = iseq.to_binary # [Bug # 21370]
roundtripped_iseq = RubyVM::InstructionSequence.load_from_binary(binary)
object = roundtripped_iseq.eval
assert_equal 1, object.test
end

def test_loading_kwargs_memory_leak
assert_no_memory_leak([], "#{<<~"begin;"}", "#{<<~'end;'}", rss: true)
a = iseq_to_binary(RubyVM::InstructionSequence.compile("foo(bar: :baz)"))
Expand Down
Loading