Fix crash when iterating over generic ivars

2 files changed, 3 insertions, 1 deletions

diff --git a/test/ruby/test_shapes.rb b/test/ruby/test_shapes.rb
index f985f8c611..bcb6791a05 100644
--- a/test/ruby/test_shapes.rb
+++ b/test/ruby/test_shapes.rb
@@ -207,6 +207,8 @@ class TestShapes < Test::Unit::TestCase
       tc.instance_variable_set(:@very_unique2, 4)
       assert_equal 3, tc.instance_variable_get(:@very_unique)
       assert_equal 4, tc.instance_variable_get(:@very_unique2)
+
+      assert_equal [:@very_unique, :@very_unique2], tc.instance_variables
     end;
   end
 
diff --git a/variable.c b/variable.c
index 7935162098..8258754e3f 100644
--- a/variable.c
+++ b/variable.c
@@ -1951,7 +1951,7 @@ gen_ivar_each(VALUE obj, rb_ivar_foreach_callback_func *func, st_data_t arg)
     itr_data.arg = arg;
     itr_data.func = func;
     if (rb_shape_obj_too_complex(obj)) {
-        rb_st_foreach((st_table *)ivtbl, each_hash_iv, (st_data_t)&itr_data);
+        rb_st_foreach(ivtbl->as.complex.table, each_hash_iv, (st_data_t)&itr_data);
     }
     else {
         iterate_over_shapes_with_callback(shape, func, &itr_data);