diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | proc.c | 1 | ||||
| -rw-r--r-- | test/ruby/test_symbol.rb | 11 |
3 files changed, 17 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Oct 5 15:34:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * proc.c (proc_new): link ep to calling block. + [ruby-core:70980] [Bug #11566] + Mon Oct 5 00:53:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * dir.c (rb_dir_getwd): make ASCII-8BIT if filesystem encoding is @@ -601,6 +601,7 @@ proc_new(VALUE klass, int8_t is_lambda) if (RUBY_VM_IFUNC_P(procval)) { VALUE newprocval = rb_proc_alloc(klass); rb_proc_t *proc = RTYPEDDATA_DATA(newprocval); + proc->block = *block; proc->block.iseq = (rb_iseq_t *)procval; proc->block.proc = newprocval; return newprocval; diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index cb6ba90698..3d1f45a927 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -117,18 +117,29 @@ class TestSymbol < Test::Unit::TestCase ary_ids = ary.collect{|x| x.object_id } assert_equal ary_ids, ary.collect(&:object_id) end + end + def test_to_proc_yield assert_ruby_status([], <<-"end;", timeout: 5.0) GC.stress = true true.tap(&:itself) end; + end + def test_to_proc_new_proc assert_ruby_status([], <<-"end;", timeout: 5.0) GC.stress = true 2.times {Proc.new(&:itself)} end; end + def test_to_proc_no_method + assert_separately([], <<-"end;", timeout: 5.0) + bug11566 = '[ruby-core:70980] [Bug #11566]' + assert_raise(NoMethodError, bug11566) {Proc.new(&:foo).(1)} + end; + end + def test_call o = Object.new def o.foo(x, y); x + y; end |