7 files changed, 41 insertions, 13 deletions
@@ -30,6 +30,7 @@ enum ruby_rstring_private_flags {
 #endif
 /* string.c */
 VALUE rb_fstring(VALUE);
 VALUE rb_fstring_cstr(const char *str);
 VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc);
@@ -1234,6 +1234,23 @@ rb_shape_verify_consistency(VALUE obj, shape_id_t shape_id)
 }
 }
 uint8_t flags_heap_index = rb_shape_heap_index(shape_id);
 if (RB_TYPE_P(obj, T_OBJECT)) {
 size_t shape_id_slot_size = rb_shape_tree.capacities[flags_heap_index - 1] * sizeof(VALUE) + sizeof(struct RBasic);
@@ -1524,6 +1541,7 @@ Init_default_shapes(void)
 root->type = SHAPE_ROOT;
 rb_shape_tree.root_shape = root;
 RUBY_ASSERT(raw_shape_id(rb_shape_tree.root_shape) == ROOT_SHAPE_ID);
 bool dontcare;
 rb_shape_t *root_with_obj_id = get_next_shape_internal(root, id_object_id, SHAPE_OBJ_ID, &dontcare, true);
@@ -1531,7 +1549,7 @@ Init_default_shapes(void)
 RUBY_ASSERT(root_with_obj_id->type == SHAPE_OBJ_ID);
 RUBY_ASSERT(root_with_obj_id->edge_name == id_object_id);
 RUBY_ASSERT(root_with_obj_id->next_field_index == 1);
- (void)root_with_obj_id;
 }
 void
@@ -23,6 +23,10 @@ STATIC_ASSERT(shape_id_num_bits, SHAPE_ID_NUM_BITS == sizeof(shape_id_t) * CHAR_
 #define SHAPE_ID_HEAP_INDEX_MAX ((1 << SHAPE_ID_HEAP_INDEX_BITS) - 1)
 #define SHAPE_ID_HEAP_INDEX_MASK (SHAPE_ID_HEAP_INDEX_MAX << SHAPE_ID_HEAP_INDEX_OFFSET)
 // The interpreter doesn't care about frozen status or slot size when reading ivars.
 // So we normalize shape_id by clearing these bits to improve cache hits.
 // JITs however might care about it.
@@ -327,6 +331,18 @@ rb_shape_obj_has_id(VALUE obj)
 return rb_shape_has_object_id(RBASIC_SHAPE_ID(obj));
 }
 // For ext/objspace
 RUBY_SYMBOL_EXPORT_BEGIN
 typedef void each_shape_callback(shape_id_t shape_id, void *data);
@@ -388,12 +388,7 @@ fstring_hash(VALUE str)
 static inline bool
 BARE_STRING_P(VALUE str)
 {
- if (RBASIC_CLASS(str) != rb_cString) return false;
-
- if (FL_TEST_RAW(str, FL_EXIVAR)) {
- return rb_ivar_count(str) == 0;
- }
- return true;
 }
 static inline st_index_t
@@ -2316,7 +2311,7 @@ VALUE
 rb_str_dup_m(VALUE str)
 {
 if (LIKELY(BARE_STRING_P(str))) {
- return str_duplicate(rb_obj_class(str), str);
 }
 else {
 return rb_obj_dup(str);
@@ -228,6 +228,7 @@ fn main() {
 .allowlist_function("rb_obj_as_string_result")
 .allowlist_function("rb_str_byte_substr")
 .allowlist_function("rb_str_substr_two_fixnums")
 // From include/ruby/internal/intern/parse.h
 .allowlist_function("rb_backref_get")
@@ -6275,16 +6275,12 @@ fn jit_rb_str_dup(
 jit_prepare_call_with_gc(jit, asm);
- // Check !FL_ANY_RAW(str, FL_EXIVAR), which is part of BARE_STRING_P.
 let recv_opnd = asm.stack_pop(1);
 let recv_opnd = asm.load(recv_opnd);
- let flags_opnd = Opnd::mem(64, recv_opnd, RUBY_OFFSET_RBASIC_FLAGS);
- asm.test(flags_opnd, Opnd::Imm(RUBY_FL_EXIVAR as i64));
- asm.jnz(Target::side_exit(Counter::send_str_dup_exivar));
 // Call rb_str_dup
 let stack_ret = asm.stack_push(Type::CString);
- let ret_opnd = asm.ccall(rb_str_dup as *const u8, vec![recv_opnd]);
 asm.mov(stack_ret, ret_opnd);
 true
@@ -1119,6 +1119,7 @@ extern "C" {
 pub fn rb_gvar_set(arg1: ID, arg2: VALUE) -> VALUE;
 pub fn rb_ensure_iv_list_size(obj: VALUE, current_len: u32, newsize: u32);
 pub fn rb_vm_barrier();
 pub fn rb_str_byte_substr(str_: VALUE, beg: VALUE, len: VALUE) -> VALUE;
 pub fn rb_str_substr_two_fixnums(
 str_: VALUE,