archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[Backport #5634]

Browse source 
* vm.c (rb_vm_make_env_object): make Proc object if Env is possible
  to point block. [ruby-core:41038] [ruby-trunk - Bug #5634]

* vm.c (rb_vm_make_proc): No need to make Proc object here.

* bootstraptest/test_proc.rb: add tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-12-11 08:51:25 +00:00
parent 1ab4abf8c3
commit 190156054e
4 changed files with 48 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Dec 11 17:49:45 2012 Koichi Sasada <ko1@atdot.net>
* vm.c (rb_vm_make_env_object): make Proc object if Env is possible
to point block. [ruby-core:41038] [ruby-trunk - Bug #5634]
* vm.c (rb_vm_make_proc): No need to make Proc object here.
* bootstraptest/test_proc.rb: add tests.
Tue Dec 11 17:47:01 2012 Narihiro Nakamura <authornari@gmail.com> Tue Dec 11 17:47:01 2012 Narihiro Nakamura <authornari@gmail.com>
* lib/irb/magic-file.rb: set a encoding, which is detected from * lib/irb/magic-file.rb: set a encoding, which is detected from

24
bootstraptest/test_proc.rb
View file

@ -456,3 +456,27 @@ assert_equal 'ok', %q{
end end
} }
assert_equal 'ok', %q{
def x
binding
end
b = x{|a| a }
b.eval('yield("ok")')
}, '[Bug #5634]'
assert_equal 'ok', %q{
def x
binding
end
eval("x { 'ok' }").eval "yield"
}, '[Bug #5634]'
assert_equal 'ok', %q{
def x
binding
end
def m
x{ 'ok' }
end
eval('yield', m)
}, '[Bug #5634]'

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 333 #define RUBY_PATCHLEVEL 334
#define RUBY_RELEASE_DATE "2012-12-11" #define RUBY_RELEASE_DATE "2012-12-11"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012

24
vm.c
View file

@ -467,16 +467,30 @@ vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary)
} }
} }
static VALUE vm_make_proc_from_block(rb_thread_t *th, rb_block_t *block);
VALUE VALUE
rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp) rb_vm_make_env_object(rb_thread_t * th, rb_control_frame_t *cfp)
{ {
VALUE envval; VALUE envval;
VALUE *lfp;
rb_block_t *blockptr;
if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_FINISH) { if (VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_FINISH) {
/* for method_missing */ /* for method_missing */
cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp); cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
} }
lfp = cfp->lfp;
blockptr = GC_GUARDED_PTR_REF(lfp[0]);
if (blockptr && !(lfp[0] & 0x02)) {
VALUE blockprocval = vm_make_proc_from_block(th, blockptr);
rb_proc_t *p;
GetProcPtr(blockprocval, p);
lfp[0] = GC_GUARDED_PTR(&p->block);
}
envval = vm_make_env_each(th, cfp, cfp->dfp, cfp->lfp); envval = vm_make_env_each(th, cfp, cfp->dfp, cfp->lfp);
rb_vm_rewrite_dfp_in_errinfo(th); rb_vm_rewrite_dfp_in_errinfo(th);
@ -545,16 +559,6 @@ rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass)
rb_bug("rb_vm_make_proc: Proc value is already created."); rb_bug("rb_vm_make_proc: Proc value is already created.");
} }
if (GC_GUARDED_PTR_REF(cfp->lfp[0])) {
rb_proc_t *p;
blockprocval = vm_make_proc_from_block(
th, (rb_block_t *)GC_GUARDED_PTR_REF(*cfp->lfp));
GetProcPtr(blockprocval, p);
*cfp->lfp = GC_GUARDED_PTR(&p->block);
}
envval = rb_vm_make_env_object(th, cfp); envval = rb_vm_make_env_object(th, cfp);
if (PROCDEBUG) { if (PROCDEBUG) {