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

Rename rb_ary_tmp_new to rb_ary_hidden_new

Browse Source 
rb_ary_tmp_new suggests that the array is temporary in some way, but
that's not true, it just creates an array that's hidden and not on the
transient heap. This commit renames it to rb_ary_hidden_new.
This commit is contained in:
Peter Zhu 2022-07-25 10:40:45 -04:00
parent 3f70aa6504
commit efb91ff19b
Notes: git 2022-07-26 22:12:36 +09:00 
Merged: https://github.com/ruby/ruby/pull/6180
23 changed files with 59 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
array.c
View File

@ -967,7 +967,7 @@ rb_ec_ary_new_from_values(rb_execution_context_t *ec, long n, const VALUE *elts)
} }
VALUE VALUE
rb_ary_tmp_new(long capa) rb_ary_hidden_new(long capa)
{ {
VALUE ary = ary_new(0, capa); VALUE ary = ary_new(0, capa);
rb_ary_transient_heap_evacuate(ary, TRUE); rb_ary_transient_heap_evacuate(ary, TRUE);
@ -975,7 +975,7 @@ rb_ary_tmp_new(long capa)
} }
VALUE VALUE
rb_ary_tmp_new_fill(long capa) rb_ary_hidden_new_fill(long capa)
{ {
VALUE ary = ary_new(0, capa); VALUE ary = ary_new(0, capa);
ary_memfill(ary, 0, capa, Qnil); ary_memfill(ary, 0, capa, Qnil);
@ -5101,7 +5101,7 @@ rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary)
} }
else if (argc > 1) { else if (argc > 1) {
int i; int i;
VALUE args = rb_ary_tmp_new(argc); VALUE args = rb_ary_hidden_new(argc);
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
rb_ary_concat(args, argv[i]); rb_ary_concat(args, argv[i]);
} }
@ -6929,8 +6929,6 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
return Qnil; return Qnil;
} }
#define tmpary(n) rb_ary_tmp_new(n)
/* /*
* Build a ruby array of the corresponding values and yield it to the * Build a ruby array of the corresponding values and yield it to the
* associated block. * associated block.
@ -7625,7 +7623,7 @@ static VALUE
rb_ary_product(int argc, VALUE *argv, VALUE ary) rb_ary_product(int argc, VALUE *argv, VALUE ary)
{ {
int n = argc+1; /* How many arrays we're operating on */ int n = argc+1; /* How many arrays we're operating on */
volatile VALUE t0 = tmpary(n); volatile VALUE t0 = rb_ary_hidden_new(n);
volatile VALUE t1 = Qundef; volatile VALUE t1 = Qundef;
VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */ VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */
int *counters = ALLOCV_N(int, t1, n); /* The current position in each one */ int *counters = ALLOCV_N(int, t1, n); /* The current position in each one */

6
class.c
View File

@ -507,7 +507,7 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
VALUE p = RCLASS_SUPER(orig); VALUE p = RCLASS_SUPER(orig);
VALUE orig_origin = RCLASS_ORIGIN(orig); VALUE orig_origin = RCLASS_ORIGIN(orig);
VALUE prev_clone_p = clone; VALUE prev_clone_p = clone;
VALUE origin_stack = rb_ary_tmp_new(2); VALUE origin_stack = rb_ary_hidden_new(2);
VALUE origin[2]; VALUE origin[2];
VALUE clone_p = 0; VALUE clone_p = 0;
long origin_len; long origin_len;
@ -1250,7 +1250,7 @@ do_include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super
RCLASS_SET_INCLUDER(iclass, klass); RCLASS_SET_INCLUDER(iclass, klass);
add_subclass = TRUE; add_subclass = TRUE;
if (module != RCLASS_ORIGIN(module)) { if (module != RCLASS_ORIGIN(module)) {
if (!origin_stack) origin_stack = rb_ary_tmp_new(2); if (!origin_stack) origin_stack = rb_ary_hidden_new(2);
VALUE origin[2] = {iclass, RCLASS_ORIGIN(module)}; VALUE origin[2] = {iclass, RCLASS_ORIGIN(module)};
rb_ary_cat(origin_stack, origin, 2); rb_ary_cat(origin_stack, origin, 2);
} }
@ -2310,7 +2310,7 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V
continue; continue;
} }
} }
if (NIL_P(missing)) missing = rb_ary_tmp_new(1); if (NIL_P(missing)) missing = rb_ary_hidden_new(1);
rb_ary_push(missing, keyword); rb_ary_push(missing, keyword);
} }
if (!NIL_P(missing)) { if (!NIL_P(missing)) {

22
compile.c
View File

@ -313,7 +313,7 @@ static void iseq_add_setlocal(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NOD
LABEL_REF(le); \ LABEL_REF(le); \
LABEL_REF(lc); \ LABEL_REF(lc); \
if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) \ if (NIL_P(ISEQ_COMPILE_DATA(iseq)->catch_table_ary)) \
RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, rb_ary_tmp_new(3)); \ RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, rb_ary_hidden_new(3)); \
rb_ary_push(ISEQ_COMPILE_DATA(iseq)->catch_table_ary, freeze_hide_obj(_e)); \ rb_ary_push(ISEQ_COMPILE_DATA(iseq)->catch_table_ary, freeze_hide_obj(_e)); \
} while (0) } while (0)
@ -627,7 +627,7 @@ decl_branch_base(rb_iseq_t *iseq, const NODE *node, const char *type)
VALUE branches; VALUE branches;
if (NIL_P(branch_base)) { if (NIL_P(branch_base)) {
branch_base = rb_ary_tmp_new(6); branch_base = rb_ary_hidden_new(6);
rb_hash_aset(structure, key, branch_base); rb_hash_aset(structure, key, branch_base);
rb_ary_push(branch_base, ID2SYM(rb_intern(type))); rb_ary_push(branch_base, ID2SYM(rb_intern(type)));
rb_ary_push(branch_base, INT2FIX(first_lineno)); rb_ary_push(branch_base, INT2FIX(first_lineno));
@ -675,7 +675,7 @@ add_trace_branch_coverage(rb_iseq_t *iseq, LINK_ANCHOR *const seq, const NODE *n
long counter_idx; long counter_idx;
if (NIL_P(branch)) { if (NIL_P(branch)) {
branch = rb_ary_tmp_new(6); branch = rb_ary_hidden_new(6);
rb_hash_aset(branches, key, branch); rb_hash_aset(branches, key, branch);
rb_ary_push(branch, ID2SYM(rb_intern(type))); rb_ary_push(branch, ID2SYM(rb_intern(type)));
rb_ary_push(branch, INT2FIX(first_lineno)); rb_ary_push(branch, INT2FIX(first_lineno));
@ -1743,7 +1743,7 @@ iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
const NODE *node = args->kw_args; const NODE *node = args->kw_args;
struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq); struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
struct rb_iseq_param_keyword *keyword; struct rb_iseq_param_keyword *keyword;
const VALUE default_values = rb_ary_tmp_new(1); const VALUE default_values = rb_ary_hidden_new(1);
const VALUE complex_mark = rb_str_tmp_new(0); const VALUE complex_mark = rb_str_tmp_new(0);
int kw = 0, rkw = 0, di = 0, i; int kw = 0, rkw = 0, di = 0, i;
@ -1847,7 +1847,7 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, const NODE *cons
if (args->opt_args) { if (args->opt_args) {
const NODE *node = args->opt_args; const NODE *node = args->opt_args;
LABEL *label; LABEL *label;
VALUE labels = rb_ary_tmp_new(1); VALUE labels = rb_ary_hidden_new(1);
VALUE *opt_table; VALUE *opt_table;
int i = 0, j; int i = 0, j;
@ -4369,7 +4369,7 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_ary_len) { if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_ary_len) {
/* The literal contains only optimizable elements, or the subarray is long enough */ /* The literal contains only optimizable elements, or the subarray is long enough */
VALUE ary = rb_ary_tmp_new(count); VALUE ary = rb_ary_hidden_new(count);
/* Create a hidden array */ /* Create a hidden array */
for (; count; count--, node = node->nd_next) for (; count; count--, node = node->nd_next)
@ -4420,7 +4420,7 @@ static int
compile_array_1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node) compile_array_1(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node)
{ {
if (static_literal_node_p(node, iseq)) { if (static_literal_node_p(node, iseq)) {
VALUE ary = rb_ary_tmp_new(1); VALUE ary = rb_ary_hidden_new(1);
rb_ary_push(ary, static_literal_value(node, iseq)); rb_ary_push(ary, static_literal_value(node, iseq));
OBJ_FREEZE(ary); OBJ_FREEZE(ary);
@ -4517,7 +4517,7 @@ compile_hash(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int meth
if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_hash_len) { if ((first_chunk && stack_len == 0 && !node_tmp) || count >= min_tmp_hash_len) {
/* The literal contains only optimizable elements, or the subsequence is long enough */ /* The literal contains only optimizable elements, or the subsequence is long enough */
VALUE ary = rb_ary_tmp_new(count); VALUE ary = rb_ary_hidden_new(count);
/* Create a hidden hash */ /* Create a hidden hash */
for (; count; count--, node = node->nd_next->nd_next) { for (; count; count--, node = node->nd_next->nd_next) {
@ -12077,7 +12077,7 @@ ibf_dump_iseq_list_i(st_data_t key, st_data_t val, st_data_t ptr)
static void static void
ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header) ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header)
{ {
VALUE offset_list = rb_ary_tmp_new(dump->iseq_table->num_entries); VALUE offset_list = rb_ary_hidden_new(dump->iseq_table->num_entries);
struct ibf_dump_iseq_list_arg args; struct ibf_dump_iseq_list_arg args;
args.dump = dump; args.dump = dump;
@ -12349,7 +12349,7 @@ ibf_load_object_array(const struct ibf_load *load, const struct ibf_object_heade
const long len = (long)ibf_load_small_value(load, &reading_pos); const long len = (long)ibf_load_small_value(load, &reading_pos);
VALUE ary = header->internal ? rb_ary_tmp_new(len) : rb_ary_new_capa(len); VALUE ary = header->internal ? rb_ary_hidden_new(len) : rb_ary_new_capa(len);
int i; int i;
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
@ -12744,7 +12744,7 @@ static void
ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_offset, unsigned int *obj_list_size) ibf_dump_object_list(struct ibf_dump *dump, ibf_offset_t *obj_list_offset, unsigned int *obj_list_size)
{ {
st_table *obj_table = dump->current_buffer->obj_table; st_table *obj_table = dump->current_buffer->obj_table;
VALUE offset_list = rb_ary_tmp_new(obj_table->num_entries); VALUE offset_list = rb_ary_hidden_new(obj_table->num_entries);
struct ibf_dump_object_list_arg args; struct ibf_dump_object_list_arg args;
args.dump = dump; args.dump = dump;

2
cont.c
View File

@ -1316,7 +1316,7 @@ cont_capture(volatile int *volatile stat)
entry = cont->ensure_array = ALLOC_N(rb_ensure_entry_t,size+1); entry = cont->ensure_array = ALLOC_N(rb_ensure_entry_t,size+1);
for (p=th->ec->ensure_list; p; p=p->next) { for (p=th->ec->ensure_list; p; p=p->next) {
if (!p->entry.marker) if (!p->entry.marker)
p->entry.marker = rb_ary_tmp_new(0); /* dummy object */ p->entry.marker = rb_ary_hidden_new(0); /* dummy object */
*entry++ = p->entry; *entry++ = p->entry;
} }
entry->marker = 0; entry->marker = 0;

4
enum.c
View File

@ -1487,7 +1487,7 @@ enum_sort_by(VALUE obj)
ary = rb_ary_new(); ary = rb_ary_new();
} }
RBASIC_CLEAR_CLASS(ary); RBASIC_CLEAR_CLASS(ary);
buf = rb_ary_tmp_new(SORT_BY_BUFSIZE*2); buf = rb_ary_hidden_new(SORT_BY_BUFSIZE*2);
rb_ary_store(buf, SORT_BY_BUFSIZE*2-1, Qnil); rb_ary_store(buf, SORT_BY_BUFSIZE*2-1, Qnil);
memo = MEMO_NEW(0, 0, 0); memo = MEMO_NEW(0, 0, 0);
data = (struct sort_by_data *)&memo->v1; data = (struct sort_by_data *)&memo->v1;
@ -1863,7 +1863,7 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
rb_raise(rb_eArgError, "too big size"); rb_raise(rb_eArgError, "too big size");
data.bufmax = data.n * 4; data.bufmax = data.n * 4;
data.curlen = 0; data.curlen = 0;
data.buf = rb_ary_tmp_new(data.bufmax * (by ? 2 : 1)); data.buf = rb_ary_hidden_new(data.bufmax * (by ? 2 : 1));
data.limit = Qundef; data.limit = Qundef;
data.cmpfunc = by ? nmin_cmp : data.cmpfunc = by ? nmin_cmp :
rb_block_given_p() ? nmin_block_cmp : rb_block_given_p() ? nmin_block_cmp :

2
ext/fiddle/closure.c
View File

@ -74,7 +74,7 @@ with_gvl_callback(void *ptr)
VALUE rbargs = rb_iv_get(self, "@args"); VALUE rbargs = rb_iv_get(self, "@args");
VALUE ctype = rb_iv_get(self, "@ctype"); VALUE ctype = rb_iv_get(self, "@ctype");
int argc = RARRAY_LENINT(rbargs); int argc = RARRAY_LENINT(rbargs);
VALUE params = rb_ary_tmp_new(argc); VALUE params = rb_ary_hidden_new(argc);
VALUE ret; VALUE ret;
VALUE cPointer; VALUE cPointer;
int i, type; int i, type;

2
ext/openssl/ossl_pkey_ec.c
View File

@ -1462,7 +1462,7 @@ static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
"use #mul(bn) form instead"); "use #mul(bn) form instead");
num = RARRAY_LEN(arg1); num = RARRAY_LEN(arg1);
bns_tmp = rb_ary_tmp_new(num); bns_tmp = rb_ary_hidden_new(num);
bignums = ALLOCV_N(const BIGNUM *, tmp_b, num); bignums = ALLOCV_N(const BIGNUM *, tmp_b, num);
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
VALUE item = RARRAY_AREF(arg1, i); VALUE item = RARRAY_AREF(arg1, i);

4
gc.c
View File

@ -9135,7 +9135,7 @@ rb_gc_register_mark_object(VALUE obj)
VALUE ary = rb_ary_last(0, 0, ary_ary); VALUE ary = rb_ary_last(0, 0, ary_ary);
if (NIL_P(ary) || RARRAY_LEN(ary) >= MARK_OBJECT_ARY_BUCKET_SIZE) { if (NIL_P(ary) || RARRAY_LEN(ary) >= MARK_OBJECT_ARY_BUCKET_SIZE) {
ary = rb_ary_tmp_new(MARK_OBJECT_ARY_BUCKET_SIZE); ary = rb_ary_hidden_new(MARK_OBJECT_ARY_BUCKET_SIZE);
rb_ary_push(ary_ary, ary); rb_ary_push(ary_ary, ary);
} }
@ -14193,7 +14193,7 @@ rb_gcdebug_add_stress_to_class(int argc, VALUE *argv, VALUE self)
rb_objspace_t *objspace = &rb_objspace; rb_objspace_t *objspace = &rb_objspace;
if (!stress_to_class) { if (!stress_to_class) {
stress_to_class = rb_ary_tmp_new(argc); stress_to_class = rb_ary_hidden_new(argc);
} }
rb_ary_cat(stress_to_class, argv, argc); rb_ary_cat(stress_to_class, argv, argc);
return self; return self;

2
hash.c
View File

@ -3294,7 +3294,7 @@ rb_hash_transform_keys_bang(int argc, VALUE *argv, VALUE hash)
if (!RHASH_TABLE_EMPTY_P(hash)) { if (!RHASH_TABLE_EMPTY_P(hash)) {
long i; long i;
VALUE new_keys = hash_alloc(0); VALUE new_keys = hash_alloc(0);
VALUE pairs = rb_ary_tmp_new(RHASH_SIZE(hash) * 2); VALUE pairs = rb_ary_hidden_new(RHASH_SIZE(hash) * 2);
rb_hash_foreach(hash, flatten_i, pairs); rb_hash_foreach(hash, flatten_i, pairs);
for (i = 0; i < RARRAY_LEN(pairs); i += 2) { for (i = 0; i < RARRAY_LEN(pairs); i += 2) {
VALUE key = RARRAY_AREF(pairs, i), new_key, val; VALUE key = RARRAY_AREF(pairs, i), new_key, val;

6
include/ruby/internal/intern/array.h
View File

@ -107,14 +107,14 @@ VALUE rb_ary_new_from_args(long n, ...);
VALUE rb_ary_new_from_values(long n, const VALUE *elts); VALUE rb_ary_new_from_values(long n, const VALUE *elts);
/** /**
* Allocates a "temporary" array. This is a hidden empty array. Handy on * Allocates a hidden (no class) empty array.
* occasions.
* *
* @param[in] capa Designed capacity of the array. * @param[in] capa Designed capacity of the array.
* @return A hidden, empty array. * @return A hidden, empty array.
* @see rb_obj_hide() * @see rb_obj_hide()
*/ */
VALUE rb_ary_tmp_new(long capa); VALUE rb_ary_hidden_new(long capa);
#define rb_ary_tmp_new rb_ary_hidden_new
/** /**
* Destroys the given array for no reason. * Destroys the given array for no reason.

2
internal/array.h
View File

@ -26,7 +26,7 @@
VALUE rb_ary_last(int, const VALUE *, VALUE); VALUE rb_ary_last(int, const VALUE *, VALUE);
void rb_ary_set_len(VALUE, long); void rb_ary_set_len(VALUE, long);
void rb_ary_delete_same(VALUE, VALUE); void rb_ary_delete_same(VALUE, VALUE);
VALUE rb_ary_tmp_new_fill(long capa); VALUE rb_ary_hidden_new_fill(long capa);
VALUE rb_ary_at(VALUE, VALUE); VALUE rb_ary_at(VALUE, VALUE);
size_t rb_ary_memsize(VALUE); size_t rb_ary_memsize(VALUE);
VALUE rb_to_array_type(VALUE obj); VALUE rb_to_array_type(VALUE obj);

6
internal/imemo.h
View File

@ -10,7 +10,7 @@
*/ */
#include "ruby/internal/config.h" #include "ruby/internal/config.h"
#include <stddef.h> /* for size_t */ #include <stddef.h> /* for size_t */
#include "internal/array.h" /* for rb_ary_tmp_new_fill */ #include "internal/array.h" /* for rb_ary_hidden_new_fill */
#include "internal/gc.h" /* for RB_OBJ_WRITE */ #include "internal/gc.h" /* for RB_OBJ_WRITE */
#include "ruby/internal/stdbool.h" /* for bool */ #include "ruby/internal/stdbool.h" /* for bool */
#include "ruby/ruby.h" /* for rb_block_call_func_t */ #include "ruby/ruby.h" /* for rb_block_call_func_t */
@ -121,9 +121,9 @@ struct MEMO {
#define MEMO_NEW(a, b, c) ((struct MEMO *)rb_imemo_new(imemo_memo, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0)) #define MEMO_NEW(a, b, c) ((struct MEMO *)rb_imemo_new(imemo_memo, (VALUE)(a), (VALUE)(b), (VALUE)(c), 0))
#define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value)) #define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value))
#define NEW_MEMO_FOR(type, value) \ #define NEW_MEMO_FOR(type, value) \
((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value)) ((value) = rb_ary_hidden_new_fill(type_roomof(type, VALUE)), MEMO_FOR(type, value))
#define NEW_PARTIAL_MEMO_FOR(type, value, member) \ #define NEW_PARTIAL_MEMO_FOR(type, value, member) \
((value) = rb_ary_tmp_new_fill(type_roomof(type, VALUE)), \ ((value) = rb_ary_hidden_new_fill(type_roomof(type, VALUE)), \
rb_ary_set_len((value), offsetof(type, member) / sizeof(VALUE)), \ rb_ary_set_len((value), offsetof(type, member) / sizeof(VALUE)), \
MEMO_FOR(type, value)) MEMO_FOR(type, value))

4
iseq.c
View File

@ -773,7 +773,7 @@ prepare_iseq_build(rb_iseq_t *iseq,
} }
ISEQ_COVERAGE_SET(iseq, coverage); ISEQ_COVERAGE_SET(iseq, coverage);
if (coverage && ISEQ_BRANCH_COVERAGE(iseq)) if (coverage && ISEQ_BRANCH_COVERAGE(iseq))
ISEQ_PC2BRANCHINDEX_SET(iseq, rb_ary_tmp_new(0)); ISEQ_PC2BRANCHINDEX_SET(iseq, rb_ary_hidden_new(0));
return Qtrue; return Qtrue;
} }
@ -2391,7 +2391,7 @@ rb_iseq_disasm_recursive(const rb_iseq_t *iseq, VALUE indent)
const struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq); const struct rb_iseq_constant_body *const body = ISEQ_BODY(iseq);
VALUE *code; VALUE *code;
VALUE str = rb_str_new(0, 0); VALUE str = rb_str_new(0, 0);
VALUE child = rb_ary_tmp_new(3); VALUE child = rb_ary_hidden_new(3);
unsigned int size; unsigned int size;
unsigned int i; unsigned int i;
long l; long l;

10
load.c
View File

@ -54,7 +54,7 @@ rb_construct_expanded_load_path(rb_vm_t *vm, enum expand_type type, int *has_rel
VALUE ary; VALUE ary;
long i; long i;
ary = rb_ary_tmp_new(RARRAY_LEN(load_path)); ary = rb_ary_hidden_new(RARRAY_LEN(load_path));
for (i = 0; i < RARRAY_LEN(load_path); ++i) { for (i = 0; i < RARRAY_LEN(load_path); ++i) {
VALUE path, as_str, expanded_path; VALUE path, as_str, expanded_path;
int is_string, non_cache; int is_string, non_cache;
@ -1427,15 +1427,15 @@ Init_load(void)
rb_alias_variable(rb_intern_const("$-I"), id_load_path); rb_alias_variable(rb_intern_const("$-I"), id_load_path);
rb_alias_variable(rb_intern_const("$LOAD_PATH"), id_load_path); rb_alias_variable(rb_intern_const("$LOAD_PATH"), id_load_path);
vm->load_path = rb_ary_new(); vm->load_path = rb_ary_new();
vm->expanded_load_path = rb_ary_tmp_new(0); vm->expanded_load_path = rb_ary_hidden_new(0);
vm->load_path_snapshot = rb_ary_tmp_new(0); vm->load_path_snapshot = rb_ary_hidden_new(0);
vm->load_path_check_cache = 0; vm->load_path_check_cache = 0;
rb_define_singleton_method(vm->load_path, "resolve_feature_path", rb_resolve_feature_path, 1); rb_define_singleton_method(vm->load_path, "resolve_feature_path", rb_resolve_feature_path, 1);
rb_define_virtual_variable("$\"", get_LOADED_FEATURES, 0); rb_define_virtual_variable("$\"", get_LOADED_FEATURES, 0);
rb_define_virtual_variable("$LOADED_FEATURES", get_LOADED_FEATURES, 0); rb_define_virtual_variable("$LOADED_FEATURES", get_LOADED_FEATURES, 0);
vm->loaded_features = rb_ary_new(); vm->loaded_features = rb_ary_new();
vm->loaded_features_snapshot = rb_ary_tmp_new(0); vm->loaded_features_snapshot = rb_ary_hidden_new(0);
vm->loaded_features_index = st_init_numtable(); vm->loaded_features_index = st_init_numtable();
vm->loaded_features_realpaths = rb_hash_new(); vm->loaded_features_realpaths = rb_hash_new();
rb_obj_hide(vm->loaded_features_realpaths); rb_obj_hide(vm->loaded_features_realpaths);
@ -1448,6 +1448,6 @@ Init_load(void)
rb_define_global_function("autoload", rb_f_autoload, 2); rb_define_global_function("autoload", rb_f_autoload, 2);
rb_define_global_function("autoload?", rb_f_autoload_p, -1); rb_define_global_function("autoload?", rb_f_autoload_p, -1);
ruby_dln_librefs = rb_ary_tmp_new(0); ruby_dln_librefs = rb_ary_hidden_new(0);
rb_gc_register_mark_object(ruby_dln_librefs); rb_gc_register_mark_object(ruby_dln_librefs);
} }

2
marshal.c
View File

@ -1763,7 +1763,7 @@ r_object_for(struct load_arg *arg, bool partial, int *ivp, VALUE extmod, int typ
{ {
VALUE path = r_unique(arg); VALUE path = r_unique(arg);
VALUE m = rb_path_to_class(path); VALUE m = rb_path_to_class(path);
if (NIL_P(extmod)) extmod = rb_ary_tmp_new(0); if (NIL_P(extmod)) extmod = rb_ary_hidden_new(0);
if (RB_TYPE_P(m, T_CLASS)) { /* prepended */ if (RB_TYPE_P(m, T_CLASS)) { /* prepended */
VALUE c; VALUE c;

2
proc.c
View File

@ -1491,7 +1491,7 @@ rb_sym_to_proc(VALUE sym)
ID id; ID id;
if (!sym_proc_cache) { if (!sym_proc_cache) {
sym_proc_cache = rb_ary_tmp_new(SYM_PROC_CACHE_SIZE * 2); sym_proc_cache = rb_ary_hidden_new(SYM_PROC_CACHE_SIZE * 2);
rb_gc_register_mark_object(sym_proc_cache); rb_gc_register_mark_object(sym_proc_cache);
rb_ary_store(sym_proc_cache, SYM_PROC_CACHE_SIZE*2 - 1, Qnil); rb_ary_store(sym_proc_cache, SYM_PROC_CACHE_SIZE*2 - 1, Qnil);
} }

2
ruby.c
View File

@ -725,7 +725,7 @@ add_modules(VALUE *req_list, const char *mod)
VALUE feature; VALUE feature;
if (!list) { if (!list) {
*req_list = list = rb_ary_tmp_new(0); *req_list = list = rb_ary_hidden_new(0);
} }
feature = rb_str_cat_cstr(rb_str_tmp_new(0), mod); feature = rb_str_cat_cstr(rb_str_tmp_new(0), mod);
rb_ary_push(list, feature); rb_ary_push(list, feature);

4
struct.c
View File

@ -115,7 +115,7 @@ struct_set_members(VALUE klass, VALUE /* frozen hidden array */ members)
while (mask < members_length * AREF_HASH_UNIT) mask *= 2; while (mask < members_length * AREF_HASH_UNIT) mask *= 2;
back = rb_ary_tmp_new(mask + 1); back = rb_ary_hidden_new(mask + 1);
rb_ary_store(back, mask, INT2FIX(members_length)); rb_ary_store(back, mask, INT2FIX(members_length));
mask -= 2; /* mask = (2**k-1)*2 */ mask -= 2; /* mask = (2**k-1)*2 */
@ -810,7 +810,7 @@ rb_struct_new(VALUE klass, ...)
size = rb_long2int(num_members(klass)); size = rb_long2int(num_members(klass));
if (size > numberof(tmpargs)) { if (size > numberof(tmpargs)) {
tmpargs[0] = rb_ary_tmp_new(size); tmpargs[0] = rb_ary_hidden_new(size);
mem = RARRAY_PTR(tmpargs[0]); mem = RARRAY_PTR(tmpargs[0]);
} }
va_start(args, klass); va_start(args, klass);

4
symbol.c
View File

@ -91,7 +91,7 @@ Init_sym(void)
rb_obj_hide(dsym_fstrs); rb_obj_hide(dsym_fstrs);
symbols->str_sym = st_init_table_with_size(&symhash, 1000); symbols->str_sym = st_init_table_with_size(&symhash, 1000);
symbols->ids = rb_ary_tmp_new(0); symbols->ids = rb_ary_hidden_new(0);
rb_gc_register_mark_object(symbols->ids); rb_gc_register_mark_object(symbols->ids);
Init_op_tbl(); Init_op_tbl();
@ -426,7 +426,7 @@ set_id_entry(rb_symbols_t *symbols, rb_id_serial_t num, VALUE str, VALUE sym)
VALUE ary, ids = symbols->ids; VALUE ary, ids = symbols->ids;
if (idx >= (size_t)RARRAY_LEN(ids) || NIL_P(ary = rb_ary_entry(ids, (long)idx))) { if (idx >= (size_t)RARRAY_LEN(ids) || NIL_P(ary = rb_ary_entry(ids, (long)idx))) {
ary = rb_ary_tmp_new(ID_ENTRY_UNIT * ID_ENTRY_SIZE); ary = rb_ary_hidden_new(ID_ENTRY_UNIT * ID_ENTRY_SIZE);
rb_ary_store(ids, (long)idx, ary); rb_ary_store(ids, (long)idx, ary);
} }
idx = (num % ID_ENTRY_UNIT) * ID_ENTRY_SIZE; idx = (num % ID_ENTRY_UNIT) * ID_ENTRY_SIZE;

14
thread.c
View File

@ -843,7 +843,7 @@ thread_create_core(VALUE thval, struct thread_create_params *params)
th->priority = current_th->priority; th->priority = current_th->priority;
th->thgroup = current_th->thgroup; th->thgroup = current_th->thgroup;
th->pending_interrupt_queue = rb_ary_tmp_new(0); th->pending_interrupt_queue = rb_ary_hidden_new(0);
th->pending_interrupt_queue_checked = 0; th->pending_interrupt_queue_checked = 0;
th->pending_interrupt_mask_stack = rb_ary_dup(current_th->pending_interrupt_mask_stack); th->pending_interrupt_mask_stack = rb_ary_dup(current_th->pending_interrupt_mask_stack);
RBASIC_CLEAR_CLASS(th->pending_interrupt_mask_stack); RBASIC_CLEAR_CLASS(th->pending_interrupt_mask_stack);
@ -5352,9 +5352,9 @@ Init_Thread(void)
struct rb_thread_sched *sched = TH_SCHED(th); struct rb_thread_sched *sched = TH_SCHED(th);
thread_sched_to_running(sched, th); thread_sched_to_running(sched, th);
th->pending_interrupt_queue = rb_ary_tmp_new(0); th->pending_interrupt_queue = rb_ary_hidden_new(0);
th->pending_interrupt_queue_checked = 0; th->pending_interrupt_queue_checked = 0;
th->pending_interrupt_mask_stack = rb_ary_tmp_new(0); th->pending_interrupt_mask_stack = rb_ary_hidden_new(0);
} }
} }
@ -5651,17 +5651,17 @@ rb_reset_coverages(void)
VALUE VALUE
rb_default_coverage(int n) rb_default_coverage(int n)
{ {
VALUE coverage = rb_ary_tmp_new_fill(3); VALUE coverage = rb_ary_hidden_new_fill(3);
VALUE lines = Qfalse, branches = Qfalse; VALUE lines = Qfalse, branches = Qfalse;
int mode = GET_VM()->coverage_mode; int mode = GET_VM()->coverage_mode;
if (mode & COVERAGE_TARGET_LINES) { if (mode & COVERAGE_TARGET_LINES) {
lines = n > 0 ? rb_ary_tmp_new_fill(n) : rb_ary_tmp_new(0); lines = n > 0 ? rb_ary_hidden_new_fill(n) : rb_ary_hidden_new(0);
} }
RARRAY_ASET(coverage, COVERAGE_INDEX_LINES, lines); RARRAY_ASET(coverage, COVERAGE_INDEX_LINES, lines);
if (mode & COVERAGE_TARGET_BRANCHES) { if (mode & COVERAGE_TARGET_BRANCHES) {
branches = rb_ary_tmp_new_fill(2); branches = rb_ary_hidden_new_fill(2);
/* internal data structures for branch coverage: /* internal data structures for branch coverage:
* *
* { branch base node => * { branch base node =>
@ -5687,7 +5687,7 @@ rb_default_coverage(int n)
rb_obj_hide(structure); rb_obj_hide(structure);
RARRAY_ASET(branches, 0, structure); RARRAY_ASET(branches, 0, structure);
/* branch execution counters */ /* branch execution counters */
RARRAY_ASET(branches, 1, rb_ary_tmp_new(0)); RARRAY_ASET(branches, 1, rb_ary_hidden_new(0));
} }
RARRAY_ASET(coverage, COVERAGE_INDEX_BRANCHES, branches); RARRAY_ASET(coverage, COVERAGE_INDEX_BRANCHES, branches);

2
thread_sync.c
View File

@ -754,7 +754,7 @@ szqueue_ptr(VALUE obj)
static VALUE static VALUE
ary_buf_new(void) ary_buf_new(void)
{ {
return rb_ary_tmp_new(1); return rb_ary_hidden_new(1);
} }
static VALUE static VALUE

2
vm.c
View File

@ -3932,7 +3932,7 @@ Init_vm_objects(void)
vm->defined_module_hash = st_init_numtable(); vm->defined_module_hash = st_init_numtable();
/* initialize mark object array, hash */ /* initialize mark object array, hash */
vm->mark_object_ary = rb_ary_tmp_new(128); vm->mark_object_ary = rb_ary_hidden_new(128);
vm->loading_table = st_init_strtable(); vm->loading_table = st_init_strtable();
vm->frozen_strings = st_init_table_with_size(&rb_fstring_hash_type, 10000); vm->frozen_strings = st_init_table_with_size(&rb_fstring_hash_type, 10000);
} }

6
vm_args.c
View File

@ -280,7 +280,7 @@ static VALUE
make_unknown_kw_hash(const VALUE *passed_keywords, int passed_keyword_len, const VALUE *kw_argv) make_unknown_kw_hash(const VALUE *passed_keywords, int passed_keyword_len, const VALUE *kw_argv)
{ {
int i; int i;
VALUE obj = rb_ary_tmp_new(1); VALUE obj = rb_ary_hidden_new(1);
for (i=0; i<passed_keyword_len; i++) { for (i=0; i<passed_keyword_len; i++) {
if (kw_argv[i] != Qundef) { if (kw_argv[i] != Qundef) {
@ -343,7 +343,7 @@ args_setup_kw_parameters(rb_execution_context_t *const ec, const rb_iseq_t *cons
found++; found++;
} }
else { else {
if (!missing) missing = rb_ary_tmp_new(1); if (!missing) missing = rb_ary_hidden_new(1);
rb_ary_push(missing, ID2SYM(key)); rb_ary_push(missing, ID2SYM(key));
} }
} }
@ -907,7 +907,7 @@ vm_caller_setup_arg_block(const rb_execution_context_t *ec, rb_control_frame_t *
VALUE func = rb_hash_lookup(ref, block_code); VALUE func = rb_hash_lookup(ref, block_code);
if (NIL_P(func)) { if (NIL_P(func)) {
/* TODO: limit cached funcs */ /* TODO: limit cached funcs */
VALUE callback_arg = rb_ary_tmp_new(2); VALUE callback_arg = rb_ary_hidden_new(2);
rb_ary_push(callback_arg, block_code); rb_ary_push(callback_arg, block_code);
rb_ary_push(callback_arg, ref); rb_ary_push(callback_arg, ref);
OBJ_FREEZE_RAW(callback_arg); OBJ_FREEZE_RAW(callback_arg);