1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify setting instance variables

Browse Source 
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.
This commit is contained in:
Aaron Patterson 2020-11-04 12:04:23 -08:00 committed by Aaron Patterson
parent a8581ce673
commit 70680feeea
Notes: git 2020-11-05 07:41:31 +09:00 
Merged: https://github.com/ruby/ruby/pull/3734
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
variable.c
View File

@ -1407,7 +1407,7 @@ obj_ivar_set(VALUE obj, ID id, VALUE val)
{ {
VALUE klass = rb_obj_class(obj); VALUE klass = rb_obj_class(obj);
struct ivar_update ivup; struct ivar_update ivup;
uint32_t i, len; uint32_t len;
ivup.iv_extended = 0; ivup.iv_extended = 0;
ivup.u.iv_index_tbl = iv_index_tbl_make(obj, klass); ivup.u.iv_index_tbl = iv_index_tbl_make(obj, klass);
@ -1420,14 +1420,6 @@ obj_ivar_set(VALUE obj, ID id, VALUE val)
len = ROBJECT_NUMIV(obj); len = ROBJECT_NUMIV(obj);
if (len <= ivup.index) { if (len <= ivup.index) {
VALUE *ptr = ROBJECT_IVPTR(obj); 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;
}
}
else {
VALUE *newptr; VALUE *newptr;
uint32_t newsize = iv_index_tbl_newsize(&ivup); uint32_t newsize = iv_index_tbl_newsize(&ivup);
@ -1447,7 +1439,6 @@ obj_ivar_set(VALUE obj, ID id, VALUE val)
ROBJECT(obj)->as.heap.numiv = newsize; ROBJECT(obj)->as.heap.numiv = newsize;
ROBJECT(obj)->as.heap.iv_index_tbl = ivup.u.iv_index_tbl; ROBJECT(obj)->as.heap.iv_index_tbl = ivup.u.iv_index_tbl;
} }
}
RB_OBJ_WRITE(obj, &ROBJECT_IVPTR(obj)[ivup.index], val); RB_OBJ_WRITE(obj, &ROBJECT_IVPTR(obj)[ivup.index], val);
return val; return val;