diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-26 20:58:25 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-26 20:58:25 +0000 |
commit | 1fe610b5885217a9bac6d9a5ef74c79589c5fbca (patch) | |
tree | 391a3d550aa031eb655e21137cfc062c508e0e67 | |
parent | 2215293a6607e8777b8201cdfe22589b3001c592 (diff) | |
download | ruby-1fe610b5885217a9bac6d9a5ef74c79589c5fbca.tar.gz |
* vm.c (invoke_block_from_c): return Qnil when its iseq is
SPECIAL CONST. [ruby-core:26335]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | vm.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Oct 27 05:56:39 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * vm.c (invoke_block_from_c): return Qnil when its iseq is + SPECIAL CONST. [ruby-core:26335] + Tue Oct 27 05:11:49 2009 NARUSE, Yui <naruse@ruby-lang.org> * vm_exec.c (DECL_SC_REG): check defined(__asm__) before use it. @@ -523,7 +523,9 @@ invoke_block_from_c(rb_thread_t *th, const rb_block_t *block, VALUE self, int argc, const VALUE *argv, const rb_block_t *blockptr, const NODE *cref) { - if (BUILTIN_TYPE(block->iseq) != T_NODE) { + if (SPECIAL_CONST_P(block->iseq)) + return Qnil; + else if (BUILTIN_TYPE(block->iseq) != T_NODE) { const rb_iseq_t *iseq = block->iseq; const rb_control_frame_t *cfp; int i, opt_pc, arg_size = iseq->arg_size; |