1 files changed, 27 insertions, 0 deletions
diff --git a/test/ruby/test_shapes.rb b/test/ruby/test_shapes.rb
index 08a841d254..453ca8f6a7 100644
--- a/test/ruby/test_shapes.rb
+++ b/test/ruby/test_shapes.rb
@@ -2,6 +2,7 @@
 require 'test/unit'
 require 'objspace'
 require 'json'
+require 'securerandom'
 
 # These test the functionality of object shapes
 class TestShapes < Test::Unit::TestCase
@@ -1182,4 +1183,30 @@ class TestShapes < Test::Unit::TestCase
       tc.send("a#{_1}_m")
     end
   end
+
+  def assert_too_complex_during_delete(obj)
+    obj.instance_variable_set("@___#{SecureRandom.hex}", 1)
+
+    (RubyVM::Shape::SHAPE_MAX_VARIATIONS * 2).times do |i|
+      obj.instance_variable_set("@ivar#{i}", i)
+    end
+
+    refute_predicate RubyVM::Shape.of(obj), :too_complex?
+    (RubyVM::Shape::SHAPE_MAX_VARIATIONS * 2).times do |i|
+      obj.remove_instance_variable("@ivar#{i}")
+    end
+    assert_predicate RubyVM::Shape.of(obj), :too_complex?
+  end
+
+  def test_object_too_complex_during_delete
+    assert_too_complex_during_delete(Class.new.new)
+  end
+
+  def test_class_too_complex_during_delete
+    assert_too_complex_during_delete(Module.new)
+  end
+
+  def test_generic_too_complex_during_delete
+    assert_too_complex_during_delete(Class.new(Array).new)
+  end
 end if defined?(RubyVM::Shape)