diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | proc.c | 36 | ||||
| -rw-r--r-- | string.c | 29 | ||||
| -rw-r--r-- | test/ruby/test_symbol.rb | 8 |
4 files changed, 51 insertions, 27 deletions
@@ -1,3 +1,8 @@ +Thu Oct 15 13:37:23 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * proc.c (rb_sym_to_proc): move from string.c and create a Proc + with no environments. [ruby-core:71088] [Bug #11594] + Thu Oct 15 01:57:03 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * test/objspace/test_objspace.rb @@ -1035,6 +1035,42 @@ rb_hash_proc(st_index_t hash, VALUE prc) return rb_hash_uint(hash, (st_index_t)proc->block.ep >> 16); } +VALUE +rb_sym_to_proc(VALUE sym) +{ + static VALUE sym_proc_cache = Qfalse; + enum {SYM_PROC_CACHE_SIZE = 67}; + VALUE proc; + long index; + ID id; + VALUE *aryp; + + if (!sym_proc_cache) { + sym_proc_cache = rb_ary_tmp_new(SYM_PROC_CACHE_SIZE * 2); + rb_gc_register_mark_object(sym_proc_cache); + rb_ary_store(sym_proc_cache, SYM_PROC_CACHE_SIZE*2 - 1, Qnil); + } + + id = SYM2ID(sym); + index = (id % SYM_PROC_CACHE_SIZE) << 1; + + aryp = RARRAY_PTR(sym_proc_cache); + if (aryp[index] == sym) { + return aryp[index + 1]; + } + else { + rb_proc_t *ptr; + VALUE ifunc = (VALUE)IFUNC_NEW(rb_sym_proc_call, (VALUE)id, 0); + proc = rb_proc_alloc(rb_cProc); + ptr = RTYPEDDATA_DATA(proc); + ptr->block.iseq = (rb_iseq_t *)ifunc; + ptr->block.proc = ifunc; + aryp[index] = sym; + aryp[index + 1] = proc; + return proc; + } +} + /* * call-seq: * prc.hash -> integer @@ -8960,6 +8960,7 @@ rb_sym_proc_call(VALUE args, VALUE sym, int argc, const VALUE *argv, VALUE passe return rb_funcall_with_block(obj, (ID)sym, argc - 1, argv + 1, passed_proc); } +#if 0 /* * call-seq: * sym.to_proc @@ -8972,34 +8973,8 @@ rb_sym_proc_call(VALUE args, VALUE sym, int argc, const VALUE *argv, VALUE passe VALUE rb_sym_to_proc(VALUE sym) { - static VALUE sym_proc_cache = Qfalse; - enum {SYM_PROC_CACHE_SIZE = 67}; - VALUE proc; - long index; - ID id; - VALUE *aryp; - - if (!sym_proc_cache) { - sym_proc_cache = rb_ary_tmp_new(SYM_PROC_CACHE_SIZE * 2); - rb_gc_register_mark_object(sym_proc_cache); - rb_ary_store(sym_proc_cache, SYM_PROC_CACHE_SIZE*2 - 1, Qnil); - } - - id = SYM2ID(sym); - index = (id % SYM_PROC_CACHE_SIZE) << 1; - - aryp = RARRAY_PTR(sym_proc_cache); - if (aryp[index] == sym) { - return aryp[index + 1]; - } - else { - proc = rb_proc_new(rb_sym_proc_call, (VALUE)id); - rb_block_clear_env_self(proc); - aryp[index] = sym; - aryp[index + 1] = proc; - return proc; - } } +#endif /* * call-seq: diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 1329ea22ab..07b75b0024 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -147,6 +147,14 @@ class TestSymbol < Test::Unit::TestCase end; end + def test_to_proc_call_with_symbol_proc + first = 1 + bug11594 = "[ruby-core:71088] [Bug #11594] corrupted the first local variable" + # symbol which does not have a Proc + ->(&blk) {}.call(&:test_to_proc_call_with_symbol_proc) + assert_equal(1, first, bug11594) + end + def test_call o = Object.new def o.foo(x, y); x + y; end |