1 files changed, 172 insertions, 15 deletions
diff --git a/test/ruby/test_weakmap.rb b/test/ruby/test_weakmap.rb
index bcaab894a7..4f5823ecf4 100644
--- a/test/ruby/test_weakmap.rb
+++ b/test/ruby/test_weakmap.rb
@@ -1,5 +1,5 @@
+# frozen_string_literal: false
 require 'test/unit'
-require_relative 'envutil'
 
 class TestWeakMap < Test::Unit::TestCase
   def setup
@@ -16,29 +16,50 @@ class TestWeakMap < Test::Unit::TestCase
 
   def test_aset_const
     x = Object.new
-    assert_raise(ArgumentError) {@wm[true] = x}
-    assert_raise(ArgumentError) {@wm[false] = x}
-    assert_raise(ArgumentError) {@wm[nil] = x}
-    assert_raise(RuntimeError) {@wm[42] = x}
-    assert_raise(RuntimeError) {@wm[:foo] = x}
-    assert_raise(ArgumentError) {@wm[x] = true}
-    assert_raise(ArgumentError) {@wm[x] = false}
-    assert_raise(ArgumentError) {@wm[x] = nil}
-    assert_raise(RuntimeError) {@wm[x] = 42}
-    assert_raise(RuntimeError) {@wm[x] = :foo}
+    @wm[true] = x
+    assert_same(x, @wm[true])
+    @wm[false] = x
+    assert_same(x, @wm[false])
+    @wm[nil] = x
+    assert_same(x, @wm[nil])
+    @wm[42] = x
+    assert_same(x, @wm[42])
+    @wm[:foo] = x
+    assert_same(x, @wm[:foo])
+
+    @wm[x] = true
+    assert_same(true, @wm[x])
+    @wm[x] = false
+    assert_same(false, @wm[x])
+    @wm[x] = nil
+    assert_same(nil, @wm[x])
+    @wm[x] = 42
+    assert_same(42, @wm[x])
+    @wm[x] = :foo
+    assert_same(:foo, @wm[x])
   end
 
-  def test_include?
-    m = __callee__[/test_(.*)/, 1]
-    k = "foo"
+  def assert_weak_include(m, k, n = 100)
+    if n > 0
+      return assert_weak_include(m, k, n-1)
+    end
     1.times do
       x = Object.new
       @wm[k] = x
       assert_send([@wm, m, k])
       assert_not_send([@wm, m, "FOO".downcase])
-      x = nil
+      x = Object.new
+    end
+  end
+
+  def test_include?
+    m = __callee__[/test_(.*)/, 1]
+    k = "foo"
+    1.times do
+      assert_weak_include(m, k)
     end
     GC.start
+    pend('TODO: failure introduced from 837fd5e494731d7d44786f29e7d6e8c27029806f')
     assert_not_send([@wm, m, k])
   end
   alias test_member? test_include?
@@ -52,6 +73,31 @@ class TestWeakMap < Test::Unit::TestCase
                  @wm.inspect)
   end
 
+  def test_inspect_garbage
+    1000.times do |i|
+      @wm[i] = Object.new
+      @wm.inspect
+    end
+    assert_match(/\A\#<#{@wm.class.name}:0x[\da-f]+(?::(?: \d+ => \#<(?:Object|collected):0x[\da-f]+>,?)+)?>\z/,
+                 @wm.inspect)
+  end
+
+  def test_delete
+    k1 = "foo"
+    x1 = Object.new
+    @wm[k1] = x1
+    assert_equal x1, @wm[k1]
+    assert_equal x1, @wm.delete(k1)
+    assert_nil @wm[k1]
+    assert_nil @wm.delete(k1)
+
+    fallback =  @wm.delete(k1) do |key|
+      assert_equal k1, key
+      42
+    end
+    assert_equal 42, fallback
+  end
+
   def test_each
     m = __callee__[/test_(.*)/, 1]
     x1 = Object.new
@@ -131,4 +177,115 @@ class TestWeakMap < Test::Unit::TestCase
     assert_equal(2, @wm.__send__(m))
   end
   alias test_length test_size
+
+  def test_frozen_object
+    o = Object.new.freeze
+    assert_nothing_raised(FrozenError) {@wm[o] = 'foo'}
+    assert_nothing_raised(FrozenError) {@wm['foo'] = o}
+  end
+
+  def test_no_memory_leak
+    assert_no_memory_leak([], '', "#{<<~"begin;"}\n#{<<~'end;'}", "[Bug #19398]", rss: true, limit: 1.5, timeout: 60)
+    begin;
+      1_000_000.times do
+        ObjectSpace::WeakMap.new
+      end
+    end;
+  end
+
+  def test_compaction
+    omit "compaction is not supported on this platform" unless GC.respond_to?(:compact)
+
+    # [Bug #19529]
+    obj = Object.new
+    100.times do |i|
+      GC.compact
+      @wm[i] = obj
+    end
+
+    assert_ruby_status([], <<-'end;')
+      wm = ObjectSpace::WeakMap.new
+      obj = Object.new
+      100.times do
+        wm[Object.new] = obj
+        GC.start
+      end
+      GC.compact
+    end;
+
+    assert_separately(%w(-robjspace), <<-'end;')
+      wm = ObjectSpace::WeakMap.new
+      key = Object.new
+      val = Object.new
+      wm[key] = val
+
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+
+      assert_equal(val, wm[key])
+    end;
+
+    assert_ruby_status(["-W0"], <<-'end;')
+      wm = ObjectSpace::WeakMap.new
+
+      ary = 10_000.times.map do
+        o = Object.new
+        wm[o] = 1
+        o
+      end
+
+      GC.verify_compaction_references(expand_heap: true, toward: :empty)
+    end;
+  end
+
+  def test_gc_compact_stress
+    omit "compaction doesn't work well on s390x" if RUBY_PLATFORM =~ /s390x/ # https://github.com/ruby/ruby/pull/5077
+    EnvUtil.under_gc_compact_stress { ObjectSpace::WeakMap.new }
+  end
+
+  def test_replaced_values_bug_19531
+    a = "A".dup
+    b = "B".dup
+
+    @wm[1] = a
+    @wm[1] = a
+    @wm[1] = a
+
+    @wm[1] = b
+    assert_equal b, @wm[1]
+
+    a = nil
+    GC.start
+
+    assert_equal b, @wm[1]
+  end
+
+  def test_use_after_free_bug_20688
+    assert_normal_exit(<<~RUBY)
+      weakmap = ObjectSpace::WeakMap.new
+      10_000.times { weakmap[Object.new] = Object.new }
+    RUBY
+  end
+
+  def test_generational_gc
+    EnvUtil.without_gc do
+      wmap = ObjectSpace::WeakMap.new
+
+      (GC::INTERNAL_CONSTANTS[:RVALUE_OLD_AGE] - 1).times { GC.start }
+
+      retain = []
+      50.times do
+        k = Object.new
+        wmap[k] = true
+        retain << k
+      end
+
+      GC.start # WeakMap promoted, other objects still young
+
+      retain.clear
+
+      GC.start(full_mark: false)
+
+      wmap.keys.each(&:itself) # call method on keys to cause crash
+    end
+  end
 end