diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-30 02:26:30 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-30 02:26:30 +0000 |
| commit | e561fc44a4cc28984ad5b8f484214df5a7b02ca3 (patch) | |
| tree | 6e5d5cfddc7bf214e7443d76c2caf793a83a8e21 /vm_insnhelper.c | |
| parent | 4431d7a72498a824659d9524bd9ed166ba76790f (diff) | |
merge revision(s) 55297: [Backport #12462]
* vm_insnhelper.c (vm_throw_start): check if the iseq is symbol
proc, class definition should not be a symbol proc.
[ruby-core:75856] [Bug #12462]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 2f34530d04..ba214ebfbe 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -996,7 +996,9 @@ vm_throw_start(rb_thread_t *const th, rb_control_frame_t *const reg_cfp, enum ru target_lep = lep; } - if (lep == target_lep && escape_cfp->iseq->body->type == ISEQ_TYPE_CLASS) { + if (lep == target_lep && + RUBY_VM_NORMAL_ISEQ_P(escape_cfp->iseq) && + escape_cfp->iseq->body->type == ISEQ_TYPE_CLASS) { in_class_frame = 1; target_lep = 0; } |