1 files changed, 52 insertions, 12 deletions
diff --git a/test/fiddle/test_function.rb b/test/fiddle/test_function.rb
index df632925ad..847df3793a 100644
--- a/test/fiddle/test_function.rb
+++ b/test/fiddle/test_function.rb
@@ -15,6 +15,16 @@ module Fiddle
       end
     end
 
+    def teardown
+      # Ensure freeing all closures.
+      # See https://github.com/ruby/fiddle/issues/102#issuecomment-1241763091 .
+      not_freed_closures = []
+      ObjectSpace.each_object(Fiddle::Closure) do |closure|
+        not_freed_closures << closure unless closure.freed?
+      end
+      assert_equal([], not_freed_closures)
+    end
+
     def test_default_abi
       func = Function.new(@libm['sin'], [TYPE_DOUBLE], TYPE_DOUBLE)
       assert_equal Function::DEFAULT, func.abi
@@ -75,18 +85,20 @@ module Fiddle
     end
 
     def test_argument_count
-      closure = Class.new(Closure) {
+      closure_class = Class.new(Closure) do
         def call one
           10 + one
         end
-      }.new(TYPE_INT, [TYPE_INT])
-      func = Function.new(closure, [TYPE_INT], TYPE_INT)
-
-      assert_raise(ArgumentError) do
-        func.call(1,2,3)
       end
-      assert_raise(ArgumentError) do
-        func.call
+      closure_class.create(TYPE_INT, [TYPE_INT]) do |closure|
+        func = Function.new(closure, [TYPE_INT], TYPE_INT)
+
+        assert_raise(ArgumentError) do
+          func.call(1,2,3)
+        end
+        assert_raise(ArgumentError) do
+          func.call
+        end
       end
     end
 
@@ -164,7 +176,7 @@ module Fiddle
       begin
         poll = @libc['poll']
       rescue Fiddle::DLError
-        skip 'poll(2) not available'
+        omit 'poll(2) not available'
       end
       f = Function.new(poll, [TYPE_VOIDP, TYPE_INT, TYPE_INT], TYPE_INT)
 
@@ -180,9 +192,37 @@ module Fiddle
     end
 
     def test_no_memory_leak
-      prep = 'r = Fiddle::Function.new(Fiddle.dlopen(nil)["rb_obj_frozen_p"], [Fiddle::TYPE_UINTPTR_T], Fiddle::TYPE_UINTPTR_T); a = "a"'
-      code = 'begin r.call(a); rescue TypeError; end'
-      assert_no_memory_leak(%w[-W0 -rfiddle], "#{prep}\n1000.times{#{code}}", "10_000.times {#{code}}", limit: 1.2)
+      if respond_to?(:assert_nothing_leaked_memory)
+        rb_obj_frozen_p_symbol = Fiddle.dlopen(nil)["rb_obj_frozen_p"]
+        rb_obj_frozen_p = Fiddle::Function.new(rb_obj_frozen_p_symbol,
+                                               [Fiddle::TYPE_UINTPTR_T],
+                                               Fiddle::TYPE_UINTPTR_T)
+        a = "a"
+        n_tries = 100_000
+        n_tries.times do
+          begin
+            a + 1
+          rescue TypeError
+          end
+        end
+        n_arguments = 1
+        sizeof_fiddle_generic = Fiddle::SIZEOF_VOIDP # Rough
+        size_per_try =
+          (sizeof_fiddle_generic * n_arguments) +
+          (Fiddle::SIZEOF_VOIDP * (n_arguments + 1))
+        assert_nothing_leaked_memory(size_per_try * n_tries) do
+          n_tries.times do
+            begin
+              rb_obj_frozen_p.call(a)
+            rescue TypeError
+            end
+          end
+        end
+      else
+        prep = 'r = Fiddle::Function.new(Fiddle.dlopen(nil)["rb_obj_frozen_p"], [Fiddle::TYPE_UINTPTR_T], Fiddle::TYPE_UINTPTR_T); a = "a"'
+        code = 'begin r.call(a); rescue TypeError; end'
+        assert_no_memory_leak(%w[-W0 -rfiddle], "#{prep}\n1000.times{#{code}}", "10_000.times {#{code}}", limit: 1.2)
+      end
     end
 
     private