1 files changed, 3 insertions, 2 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 236b3fd3f5..75e0f91b36 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -1298,8 +1298,9 @@ vm_setivar(VALUE obj, ID id, VALUE val, IC ic)
     if (!OBJ_UNTRUSTED(obj) && rb_safe_level() >= 4) {
 	rb_raise(rb_eSecurityError, "Insecure: can't modify instance variable");
     }
-    
-    rb_check_frozen(obj);
+    if (OBJ_FROZEN(obj)) {
+	rb_error_frozen("object");
+    }
 
     if (TYPE(obj) == T_OBJECT) {
 	VALUE klass = RBASIC(obj)->klass;