Simplify setting instance variables

Since T_OBJECT objects come to life as embedded objects, that means that
ROBJECT_NUMIV will always return a _minimum_ of ROBJECT_EMBED_LEN_MAX.
If ivup.index is *greater* than ROBJECT_NUMIV, then we know that the
object *must not* be an embedded object. Thus we can skip the
ROBJECT_EMBED_LEN_MAX check as well as initializing internals of
embedded objects.

1 files changed, 15 insertions, 24 deletions

diff --git a/variable.c b/variable.c
index c231ab9725..7ebbcf85b8 100644
--- a/variable.c
+++ b/variable.c
@@ -1407,7 +1407,7 @@ obj_ivar_set(VALUE obj, ID id, VALUE val)
 {
     VALUE klass = rb_obj_class(obj);
     struct ivar_update ivup;
-    uint32_t i, len;
+    uint32_t len;
     ivup.iv_extended = 0;
     ivup.u.iv_index_tbl = iv_index_tbl_make(obj, klass);
 
@@ -1420,33 +1420,24 @@ obj_ivar_set(VALUE obj, ID id, VALUE val)
     len = ROBJECT_NUMIV(obj);
     if (len <= ivup.index) {
         VALUE *ptr = ROBJECT_IVPTR(obj);
-        if (ivup.index < ROBJECT_EMBED_LEN_MAX) {
-            RBASIC(obj)->flags |= ROBJECT_EMBED;
-            ptr = ROBJECT(obj)->as.ary;
-            for (i = 0; i < ROBJECT_EMBED_LEN_MAX; i++) {
-                ptr[i] = Qundef;
-            }
+        VALUE *newptr;
+        uint32_t newsize = iv_index_tbl_newsize(&ivup);
+
+        if (RBASIC(obj)->flags & ROBJECT_EMBED) {
+            newptr = obj_ivar_heap_alloc(obj, newsize);
+            MEMCPY(newptr, ptr, VALUE, len);
+            RBASIC(obj)->flags &= ~ROBJECT_EMBED;
+            ROBJECT(obj)->as.heap.ivptr = newptr;
         }
         else {
-            VALUE *newptr;
-            uint32_t newsize = iv_index_tbl_newsize(&ivup);
-
-            if (RBASIC(obj)->flags & ROBJECT_EMBED) {
-                newptr = obj_ivar_heap_alloc(obj, newsize);
-                MEMCPY(newptr, ptr, VALUE, len);
-                RBASIC(obj)->flags &= ~ROBJECT_EMBED;
-                ROBJECT(obj)->as.heap.ivptr = newptr;
-            }
-            else {
-                newptr = obj_ivar_heap_realloc(obj, len, newsize);
-            }
+            newptr = obj_ivar_heap_realloc(obj, len, newsize);
+        }
 
-            for (; len < newsize; len++) {
-                newptr[len] = Qundef;
-            }
-            ROBJECT(obj)->as.heap.numiv = newsize;
-            ROBJECT(obj)->as.heap.iv_index_tbl = ivup.u.iv_index_tbl;
+        for (; len < newsize; len++) {
+            newptr[len] = Qundef;
         }
+        ROBJECT(obj)->as.heap.numiv = newsize;
+        ROBJECT(obj)->as.heap.iv_index_tbl = ivup.u.iv_index_tbl;
     }
     RB_OBJ_WRITE(obj, &ROBJECT_IVPTR(obj)[ivup.index], val);