summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2022-09-30 15:37:18 -0400
committerAaron Patterson <aaron.patterson@gmail.com>2022-09-30 13:57:59 -0700
commit0ab0229c1162308509b36cafbf6eaafd7ae054d7 (patch)
tree9232e7d3604258fa0c05569187bec4a475e70031
parenta44040c9e47a9cb41807b0ec5d665d656d60db84 (diff)
Fix frozen object inspect
In the rails/rails CI build for Ruby master we found that some tests were failing due to inspect on a frozen object being incorrect. An object's instance variable count was incorrect when frozen causing the object's inspect to not splat out the object. This fixes the issue and adds a test for inspecting frozen objects. Co-Authored-By: Jemma Issroff <jemmaissroff@gmail.com> Co-Authored-By: Aaron Patterson <tenderlove@ruby-lang.org>
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/6478
-rw-r--r--shape.c3
-rw-r--r--test/ruby/test_object.rb9
2 files changed, 10 insertions, 2 deletions
diff --git a/shape.c b/shape.c
index ba195c3c96..a6a5adf854 100644
--- a/shape.c
+++ b/shape.c
@@ -149,13 +149,12 @@ get_next_shape_internal(rb_shape_t* shape, ID id, VALUE obj, enum shape_type sha
}
break;
case SHAPE_IVAR_UNDEF:
+ case SHAPE_FROZEN:
new_shape->iv_count = new_shape->parent->iv_count;
break;
case SHAPE_ROOT:
rb_bug("Unreachable");
break;
- case SHAPE_FROZEN:
- break;
}
rb_id_table_insert(shape->edges, id, (VALUE)new_shape);
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index 83208bbcdb..a9d5d4b13e 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -993,4 +993,13 @@ class TestObject < Test::Unit::TestCase
end
EOS
end
+
+ def test_frozen_inspect
+ obj = Object.new
+ obj.instance_variable_set(:@a, "a")
+ ins = obj.inspect
+ obj.freeze
+
+ assert_equal(ins, obj.inspect)
+ end
end