add prefix to the function name.
* vm.c (handle_exception): rename to vm_exce_handle_exception. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3527c05a8f
commit
8d9c6e3233
9
vm.c
9
vm.c
@ -1794,7 +1794,7 @@ hook_before_rewind(rb_execution_context_t *ec, const rb_control_frame_t *cfp, in
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
static inline VALUE
|
static inline VALUE
|
||||||
handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state,
|
vm_exce_handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state,
|
||||||
VALUE errinfo, VALUE *initial);
|
VALUE errinfo, VALUE *initial);
|
||||||
|
|
||||||
MJIT_FUNC_EXPORTED VALUE
|
MJIT_FUNC_EXPORTED VALUE
|
||||||
@ -1808,14 +1808,15 @@ vm_exec(rb_execution_context_t *ec, int mjit_enable_p)
|
|||||||
|
|
||||||
_tag.retval = Qnil;
|
_tag.retval = Qnil;
|
||||||
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
|
if ((state = EC_EXEC_TAG()) == TAG_NONE) {
|
||||||
if (!mjit_enable_p || (result = mjit_exec(ec)) == Qundef)
|
if (!mjit_enable_p || (result = mjit_exec(ec)) == Qundef) {
|
||||||
result = vm_exec_core(ec, initial);
|
result = vm_exec_core(ec, initial);
|
||||||
|
}
|
||||||
goto vm_loop_start; /* fallback to the VM */
|
goto vm_loop_start; /* fallback to the VM */
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
result = ec->errinfo;
|
result = ec->errinfo;
|
||||||
rb_ec_raised_reset(ec, RAISED_STACKOVERFLOW);
|
rb_ec_raised_reset(ec, RAISED_STACKOVERFLOW);
|
||||||
while ((result = handle_exception(ec, state, result, &initial)) == Qundef) {
|
while ((result = vm_exce_handle_exception(ec, state, result, &initial)) == Qundef) {
|
||||||
/* caught a jump, exec the handler */
|
/* caught a jump, exec the handler */
|
||||||
result = vm_exec_core(ec, initial);
|
result = vm_exec_core(ec, initial);
|
||||||
vm_loop_start:
|
vm_loop_start:
|
||||||
@ -1830,7 +1831,7 @@ vm_exec(rb_execution_context_t *ec, int mjit_enable_p)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static inline VALUE
|
static inline VALUE
|
||||||
handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state,
|
vm_exce_handle_exception(rb_execution_context_t *ec, enum ruby_tag_type state,
|
||||||
VALUE errinfo, VALUE *initial)
|
VALUE errinfo, VALUE *initial)
|
||||||
{
|
{
|
||||||
struct vm_throw_data *err = (struct vm_throw_data *)errinfo;
|
struct vm_throw_data *err = (struct vm_throw_data *)errinfo;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user