Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplified rb_obj_copy_ivar implementation #6573

Merged
merged 1 commit into from Oct 17, 2022
Merged

Simplified rb_obj_copy_ivar implementation #6573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 8 additions & 24 deletions object.c
View file
Open in desktop
Expand Up @@ -268,37 +268,21 @@ rb_obj_singleton_class(VALUE obj)
MJIT_FUNC_EXPORTED void
rb_obj_copy_ivar(VALUE dest, VALUE obj)
{
VALUE *dest_buf = ROBJECT_IVPTR(dest);
VALUE *src_buf = ROBJECT_IVPTR(obj);
uint32_t dest_len = ROBJECT_NUMIV(dest);
uint32_t src_len = ROBJECT_NUMIV(obj);
uint32_t max_len = dest_len < src_len ? src_len : dest_len;

rb_ensure_iv_list_size(dest, dest_len, max_len);

dest_len = ROBJECT_NUMIV(dest);
uint32_t min_len = dest_len > src_len ? src_len : dest_len;

if (RBASIC(obj)->flags & ROBJECT_EMBED) {
src_buf = ROBJECT(obj)->as.ary;

// embedded -> embedded
if (RBASIC(dest)->flags & ROBJECT_EMBED) {
dest_buf = ROBJECT(dest)->as.ary;
}
// embedded -> extended
else {
dest_buf = ROBJECT(dest)->as.heap.ivptr;
}
if (dest_len < src_len) {
rb_ensure_iv_list_size(dest, dest_len, src_len);
RUBY_ASSERT(!(RBASIC(dest)->flags & ROBJECT_EMBED));
}
// extended -> extended
else {
RUBY_ASSERT(!(RBASIC(dest)->flags & ROBJECT_EMBED));
dest_buf = ROBJECT(dest)->as.heap.ivptr;
src_buf = ROBJECT(obj)->as.heap.ivptr;
RUBY_ASSERT((RBASIC(dest)->flags & ROBJECT_EMBED));
}

MEMCPY(dest_buf, src_buf, VALUE, min_len);
VALUE * dest_buf = ROBJECT_IVPTR(dest);
VALUE * src_buf = ROBJECT_IVPTR(obj);

MEMCPY(dest_buf, src_buf, VALUE, ROBJECT_IV_COUNT(obj));
}

static void
Expand Down