diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-28 11:02:30 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-28 11:02:30 +0000 |
| commit | 86613d4fc636ad9314b84e4d9be9c5c92a0a5318 (patch) | |
| tree | 49b3f9ff4924a622e13fbdfc9478d34717d19378 /vm_method.c | |
| parent | b9843a42d170e624fe86b9d1c034b75fb50aef8b (diff) | |
| download | ruby-86613d4fc636ad9314b84e4d9be9c5c92a0a5318.tar.gz | |
* vm_core.h: revisit the structure of frame, block and env.
[Bug #12628]
This patch introduce many changes.
* Introduce concept of "Block Handler (BH)" to represent
passed blocks.
* move rb_control_frame_t::flag to ep[0] (as a special local
variable). This flags represents not only frame type, but also
env flags such as escaped.
* rename `rb_block_t` to `struct rb_block`.
* Make Proc, Binding and RubyVM::Env objects wb-protected.
Check [Bug #12628] for more details.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_method.c')
| -rw-r--r-- | vm_method.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vm_method.c b/vm_method.c index 69f98c4421..acdd976ff9 100644 --- a/vm_method.c +++ b/vm_method.c @@ -1871,9 +1871,9 @@ call_method_entry(rb_thread_t *th, VALUE defined_class, VALUE obj, ID id, { const rb_callable_method_entry_t *cme = prepare_callable_method_entry(defined_class, id, me); - const rb_block_t *passed_block = th->passed_block; + VALUE passed_block_handler = vm_passed_block_handler(th); VALUE result = vm_call0(th, obj, id, argc, argv, cme); - th->passed_block = passed_block; + vm_passed_block_handler_set(th, passed_block_handler); return result; } |