[3.4] compile.c: Handle anonymous variables in outer_variable_cmp (#13493)

byroot · web-flow · commit 6882012473b3 · 2025-09-16T14:17:51.000-07:00
diff --git a/compile.c b/compile.c
@@ -13236,6 +13236,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
@@ -905,6 +905,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 = RubyVM::InstructionSequence.compile("foo(bar: :baz)").to_binary

Original file line number	Diff line number	Diff line change
`@@ -13236,6 +13236,13 @@ outer_variable_cmp(const void a, const void b, void *arg)`
`13236`	`13236`	`{`
`13237`	`13237`	`const struct outer_variable_pair ap = (const struct outer_variable_pair )a;`
`13238`	`13238`	`const struct outer_variable_pair bp = (const struct outer_variable_pair )b;`
	`13239`	`+`
	`13240`	`+ if (!ap->name) {`
	`13241`	`+ return -1;`
	`13242`	`+ } else if (!bp->name) {`
	`13243`	`+ return 1;`
	`13244`	`+ }`
	`13245`	`+`
`13239`	`13246`	`return rb_str_cmp(ap->name, bp->name);`
`13240`	`13247`	`}`
`13241`	`13248`