mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* vm_trace.c (rb_tracepoint_attr_raised_exception): should not check
value before event checking. * vm_trace.c (rb_tracepoint_attr_return_value): ditto. * test/ruby/test_settracefunc.rb: add tests for TracePoint#return_value and TracePoint#raised_exception. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									76cffcdbf2
								
							
						
					
					
						commit
						9d803dfd5f
					
				
					 3 changed files with 59 additions and 6 deletions
				
			
		
							
								
								
									
										12
									
								
								vm_trace.c
									
										
									
									
									
								
							
							
						
						
									
										12
									
								
								vm_trace.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -750,15 +750,15 @@ rb_tracepoint_attr_return_value(VALUE tpval)
 | 
			
		|||
    rb_tp_t *tp = tpptr(tpval);
 | 
			
		||||
    tp_attr_check_active(tp);
 | 
			
		||||
 | 
			
		||||
    if (tp->trace_arg->data == Qundef) {
 | 
			
		||||
	rb_bug("tp_attr_return_value_m: unreachable");
 | 
			
		||||
    }
 | 
			
		||||
    if (tp->trace_arg->event & (RUBY_EVENT_RETURN | RUBY_EVENT_C_RETURN)) {
 | 
			
		||||
	/* ok */
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
	rb_raise(rb_eRuntimeError, "not supported by this event");
 | 
			
		||||
    }
 | 
			
		||||
    if (tp->trace_arg->data == Qundef) {
 | 
			
		||||
	rb_bug("tp_attr_return_value_m: unreachable");
 | 
			
		||||
    }
 | 
			
		||||
    return tp->trace_arg->data;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -768,15 +768,15 @@ rb_tracepoint_attr_raised_exception(VALUE tpval)
 | 
			
		|||
    rb_tp_t *tp = tpptr(tpval);
 | 
			
		||||
    tp_attr_check_active(tp);
 | 
			
		||||
 | 
			
		||||
    if (tp->trace_arg->data == Qundef) {
 | 
			
		||||
	rb_bug("tp_attr_raised_exception_m: unreachable");
 | 
			
		||||
    }
 | 
			
		||||
    if (tp->trace_arg->event & (RUBY_EVENT_RAISE)) {
 | 
			
		||||
	/* ok */
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
	rb_raise(rb_eRuntimeError, "not supported by this event");
 | 
			
		||||
    }
 | 
			
		||||
    if (tp->trace_arg->data == Qundef) {
 | 
			
		||||
	rb_bug("tp_attr_raised_exception_m: unreachable");
 | 
			
		||||
    }
 | 
			
		||||
    return tp->trace_arg->data;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue