compile.c: Handle anonymous variables in outer_variable_cmp

byroot · byroot · commit 2d6f8e9c9417 · 2025-06-02T12:47:38.000+02:00
[Bug #21370]
diff --git a/compile.c b/compile.c
@@ -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);
 }
 
diff --git a/test/ruby/test_iseq.rb b/test/ruby/test_iseq.rb
@@ -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)"))

Original file line number	Diff line number	Diff line change
`@@ -13378,6 +13378,13 @@ outer_variable_cmp(const void a, const void b, void *arg)`
`13378`	`13378`	`{`
`13379`	`13379`	`const struct outer_variable_pair ap = (const struct outer_variable_pair )a;`
`13380`	`13380`	`const struct outer_variable_pair bp = (const struct outer_variable_pair )b;`
	`13381`	`+`
	`13382`	`+ if (!ap->name) {`
	`13383`	`+ return -1;`
	`13384`	`+ } else if (!bp->name) {`
	`13385`	`+ return 1;`
	`13386`	`+ }`
	`13387`	`+`
`13381`	`13388`	`return rb_str_cmp(ap->name, bp->name);`
`13382`	`13389`	`}`
`13383`	`13390`