8000 merge revision(s) r45758,r45759: [Backport #9759] · github/ruby@a40b9a3 · GitHub
[go: up one dir, main page]
Skip to content

Commit a40b9a3

Browse files
nagachikanagachika
committed
merge revision(s) r45758,r45759: [Backport ruby#9759]
 * vm.c (invoke_block_from_c): add VM_FRAME_FLAG_BMETHOD to record it is bmethod frame. * vm.c (vm_exec): invoke RUBY_EVENT_RETURN event if rollbacked frame is VM_FRAME_FLAG_BMETHOD. [Bug ruby#9759] * test/ruby/test_settracefunc.rb: add a test for TracePoint/set_trace_func. * vm_core.h: rename rb_thread_t::passed_me to rb_thread_t::passed_bmethod_me to clarify the usage. * vm_insnhelper.c (vm_call_bmethod_body): use renamed member. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45928 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent f565774 commit a40b9a3

File tree

6 files changed

+83
-14
lines changed

6 files changed

+83
-14
lines changed

‎ChangeLog

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
Mon May 12 22:22:43 2014 Koichi Sasada <ko1@atdot.net>
2+
3+
* vm.c (invoke_block_from_c): add VM_FRAME_FLAG_BMETHOD to record
4+
it is bmethod frame.
5+
6+
* vm.c (vm_exec): invoke RUBY_EVENT_RETURN event if rollbacked frame
7+
is VM_FRAME_FLAG_BMETHOD.
8+
[Bug #9759]
9+
10+
* test/ruby/test_settracefunc.rb: add a test for TracePoint/set_trace_func.
11+
12+
* vm_core.h: rename rb_thread_t::passed_me to
13+
rb_thread_t::passed_bmethod_me to clarify the usage.
14+
15+
* vm_insnhelper.c (vm_call_bmethod_body): use renamed member.
16+
117
Mon May 12 22:11:47 2014 Shota Fukumori <her@sorah.jp>
218

319
* vm_eval.c (eval_string_with_cref): Unify to use NIL_P.

‎test/ruby/test_settracefunc.rb

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,4 +1066,38 @@ def test_a_return
10661066
:b_return
10671067
], events)
10681068
end
1069+
class C9759
1070+
define_method(:foo){
1071+
raise
1072+
}
1073+
end
1074+
1075+
def test_define_method_on_exception
1076+
events = []
1077+
obj = C9759.new
1078+
TracePoint.new(:call, :return){|tp|
1079+
next unless target_thread?
1080+
events << [tp.event, tp.method_id]
1081+
}.enable{
1082+
obj.foo rescue nil
1083+
}
1084+
assert_equal([[:call, :foo], [:return, :foo]], events, 'Bug #9759')
1085+
1086+
events = []
1087+
begin
1088+
set_trace_func(lambda{|event, file, lineno, mid, binding, klass|
1089+
next unless target_thread?
1090+
case event
1091+
when 'call', 'return'
1092+
events << [event, mid]
1093+
end
1094+
})
1095+
obj.foo rescue nil
1096+
set_trace_func(nil)
1097+
1098+
assert_equal([['call', :foo], ['return', :foo]], events, 'Bug #9759')
1099+
ensure
1100+
end
1101+
1102+
end
10691103
end

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.2"
22
#define RUBY_RELEASE_DATE "2014-05-12"
3-
#define RUBY_PATCHLEVEL 98
3+
#define RUBY_PATCHLEVEL 99
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 5

‎vm.c

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -717,13 +717,24 @@ invoke_block_from_c(rb_thread_t *th, const rb_block_t *block,
717717
opt_pc = vm_yield_setup_args(th, iseq, argc, cfp->sp, blockptr,
718718
type == VM_FRAME_MAGIC_LAMBDA);
719719

720-
vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH,
721-
self, defined_class,
722-
VM_ENVVAL_PREV_EP_PTR(block->ep),
723-
iseq->iseq_encoded + opt_pc,
724-
cfp->sp + arg_size, iseq->local_size - arg_size,
725-
th->passed_me, iseq->stack_max);
726-
th->passed_me = 0;
720+
if (th->passed_bmethod_me != 0) {
721+
/* bmethod */
722+
vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH | VM_FRAME_FLAG_BMETHOD,
723+
self, defined_class,
724+
VM_ENVVAL_PREV_EP_PTR(block->ep),
725+
iseq->iseq_encoded + opt_pc,
726+
cfp->sp + arg_size, iseq->local_size - arg_size,
727+
th->passed_bmethod_me, iseq->stack_max);
728+
th->passed_bmethod_me = 0;
729+
}
730+
else {
731+
vm_push_frame(th, iseq, type | VM_FRAME_FLAG_FINISH,
732+
self, defined_class,
733+
VM_ENVVAL_PREV_EP_PTR(block->ep),
734+
iseq->iseq_encoded + opt_pc,
735+
cfp->sp + arg_size, iseq->local_size - arg_size,
736+
0, iseq->stack_max);
737+
}
727738

728739
if (cref) {
729740
th->cfp->ep[-1] = (VALUE)cref;
@@ -1512,7 +1523,13 @@ vm_exec(rb_thread_t *th)
15121523
break;
15131524
case VM_FRAME_MAGIC_BLOCK:
15141525
case VM_FRAME_MAGIC_LAMBDA:
1515-
EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil);
1526+
if (VM_FRAME_TYPE_BMETHOD_P(th->cfp)) {
1527+
EXEC_EVENT_HOOK(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil);
1528+
EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_RETURN, th->cfp->self, th->cfp->me->called_id, th->cfp->me->klass, Qnil);
1529+
}
1530+
else {
1531+
EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_B_RETURN, th->cfp->self, 0, 0, Qnil);
1532+
}
15161533
break;
15171534
case VM_FRAME_MAGIC_CLASS:
15181535
EXEC_EVENT_HOOK_AND_POP_FRAME(th, RUBY_EVENT_END, th->cfp->self, 0, 0, Qnil);

‎vm_core.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ typedef struct rb_thread_struct {
542542
const rb_block_t *passed_block;
543543

544544
/* for bmethod */
545-
const rb_method_entry_t *passed_me;
545+
const rb_method_entry_t *passed_bmethod_me;
546546

547547
/* for cfunc */
548548
rb_call_info_t *passed_ci;
@@ -768,9 +768,11 @@ enum vm_special_object_type {
768768
#define VM_FRAME_TYPE(cfp) ((cfp)->flag & VM_FRAME_MAGIC_MASK)
769769

770770
/* other frame flag */
771-
#define VM_FRAME_FLAG_PASSED 0x0100
772-
#define VM_FRAME_FLAG_FINISH 0x0200
773-
#define VM_FRAME_TYPE_FINISH_P(cfp) (((cfp)->flag & VM_FRAME_FLAG_FINISH) != 0)
771+
#define VM_FRAME_FLAG_PASSED 0x0100
772+
#define VM_FRAME_FLAG_FINISH 0x0200
773+
#define VM_FRAME_FLAG_BMETHOD 0x0400
774+
#define VM_FRAME_TYPE_FINISH_P(cfp) (((cfp)->flag & VM_FRAME_FLAG_FINISH) != 0)
775+
#define VM_FRAME_TYPE_BMETHOD_P(cfp) (((cfp)->flag & VM_FRAME_FLAG_BMETHOD) != 0)
774776

775777
#define RUBYVM_CFUNC_FRAME_P(cfp) \
776778
(VM_FRAME_TYPE(cfp) == VM_FRAME_MAGIC_CFUNC)

‎vm_insnhelper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1587,7 +1587,7 @@ vm_call_bmethod_body(rb_thread_t *th, rb_call_info_t *ci, const VALUE *argv)
15871587
EXEC_EVENT_HOOK(th, RUBY_EVENT_CALL, ci->recv, ci->me->called_id, ci->me->klass, Qnil);
15881588

15891589
/* control block frame */
1590-
th->passed_me = ci->me;
1590+
th->passed_bmethod_me = ci->me;
15911591
GetProcPtr(ci->me->def->body.proc, proc);
15921592
val = vm_invoke_proc(th, proc, ci->recv, ci->defined_class, ci->argc, argv, ci->blockptr);
15931593

0 commit comments

Comments
 (0)
0