1 files changed, 2 insertions, 9 deletions
diff --git a/shape.c b/shape.c
index 3e70589a6e..50cf8dcc0d 100644
--- a/shape.c
+++ b/shape.c
@@ -877,7 +877,7 @@ shape_get_next(rb_shape_t *shape, VALUE obj, ID id, bool emit_warnings)
 #endif
 
     VALUE klass;
-    if (IMEMO_TYPE_P(obj, imemo_class_fields)) { // HACK
+    if (IMEMO_TYPE_P(obj, imemo_fields)) { // HACK
         klass = CLASS_OF(obj);
     }
     else {
@@ -1262,17 +1262,10 @@ rb_shape_verify_consistency(VALUE obj, shape_id_t shape_id)
     }
     else {
         if (flags_heap_index) {
-            rb_bug("shape_id indicate heap_index > 0 but objet is not T_OBJECT: %s", rb_obj_info(obj));
+            rb_bug("shape_id indicate heap_index > 0 but object is not T_OBJECT: %s", rb_obj_info(obj));
         }
     }
 
-    if (FL_TEST_RAW(obj, FL_EXIVAR)) {
-        RUBY_ASSERT(rb_obj_exivar_p(obj));
-    }
-    else {
-        RUBY_ASSERT(!rb_obj_exivar_p(obj));
-    }
-
     return true;
 }
 #endif