3 files changed, 69 insertions, 10 deletions
diff --git a/test/-ext-/tracepoint/test_tracepoint.rb b/test/-ext-/tracepoint/test_tracepoint.rb
index 1fc1657f5b..4f480bb856 100644
--- a/test/-ext-/tracepoint/test_tracepoint.rb
+++ b/test/-ext-/tracepoint/test_tracepoint.rb
@@ -10,33 +10,25 @@ class TestTracepointObj < Test::Unit::TestCase
   end
 
   def test_tracks_objspace_events
-    result = Bug.tracepoint_track_objspace_events{
-      Object.new
-    }
-    object_new_newobj = result[0]
-
     result = EnvUtil.suppress_warning {eval(<<-EOS, nil, __FILE__, __LINE__+1)}
     Bug.tracepoint_track_objspace_events {
       99
       'abc'
       _="foobar"
-      Object.new
       nil
     }
     EOS
 
     newobj_count, free_count, gc_start_count, gc_end_mark_count, gc_end_sweep_count, *newobjs = *result
-    assert_equal 1 + object_new_newobj, newobj_count
-    assert_equal 1 + object_new_newobj, newobjs.size
+    assert_equal 1, newobj_count
+    assert_equal 1, newobjs.size
     assert_equal 'foobar', newobjs[0]
-    assert_equal Object, newobjs[1].class
     assert_operator free_count, :>=, 0
     assert_operator gc_start_count, :==, gc_end_mark_count
     assert_operator gc_start_count, :>=, gc_end_sweep_count
   end
 
   def test_tracks_objspace_count
-    return
     stat1 = {}
     stat2 = {}
     GC.disable
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index ef99f69f50..9442041ee5 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -94,6 +94,9 @@ class TestGc < Test::Unit::TestCase
     GC.start
     GC.stat(stat)
     ObjectSpace.count_objects(count)
+    # repeat same methods invocation for cache object creation.
+    GC.stat(stat)
+    ObjectSpace.count_objects(count) 
     assert_equal(count[:TOTAL]-count[:FREE], stat[:heap_live_slots])
     assert_equal(count[:FREE], stat[:heap_free_slots])
 
diff --git a/test/ruby/test_inlinecache.rb b/test/ruby/test_inlinecache.rb
new file mode 100644
index 0000000000..90d0189d4c
--- /dev/null
+++ b/test/ruby/test_inlinecache.rb
@@ -0,0 +1,64 @@
+# -*- coding: us-ascii -*-
+# frozen_string_literal: true
+
+require 'test/unit'
+
+class TestMethod < Test::Unit::TestCase
+  def test_alias
+    m0 = Module.new do
+      def foo; :M0 end
+    end
+    m1 = Module.new do
+      include m0
+    end
+    c = Class.new do
+      include m1
+      alias bar foo
+    end
+    d = Class.new(c) do
+    end
+
+    test = -> do
+      d.new.bar
+    end
+
+    assert_equal :M0, test[]
+
+    c.class_eval do
+      def bar
+        :C
+      end
+    end
+
+    assert_equal :C, test[]
+  end
+
+  def test_zsuper
+    assert_separately [], <<-EOS
+      class C
+        private def foo
+          :C
+        end
+      end
+
+      class D < C
+        public :foo
+      end
+
+      class E < D; end
+      class F < E; end
+
+      test = -> do
+        F.new().foo
+      end
+
+      assert_equal :C, test[]
+
+      class E
+        def foo; :E; end
+      end
+
+      assert_equal :E, test[]
+    EOS
+  end
+end