diff options
| author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-05 15:49:32 +0000 |
|---|---|---|
| committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-05 15:49:32 +0000 |
| commit | 68baf9551e5d7bb43d1a7cce8e80ecb5f06e8724 (patch) | |
| tree | 9c5fe69928d2ba3e15e68827decfb2295f5f93fc | |
| parent | 43866a33c524c19a292774d2ee849997980a96ba (diff) | |
vm_insnhelper.c: prefix rb_ to simple_iseq_p
which is started to be used by mjit_compile.c in r62197.
Related to r62235, this intends to transform the function to static.
Of course we shouldn't pollute the namespace anyway.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | mjit_compile.c | 4 | ||||
| -rw-r--r-- | vm_insnhelper.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mjit_compile.c b/mjit_compile.c index b323192fe9..226d3e30a7 100644 --- a/mjit_compile.c +++ b/mjit_compile.c @@ -57,9 +57,9 @@ get_iseq_if_available(CALL_CACHE cc) static int inlinable_iseq_p(CALL_INFO ci, CALL_CACHE cc, const rb_iseq_t *iseq) { - extern int simple_iseq_p(const rb_iseq_t *iseq); + extern int rb_simple_iseq_p(const rb_iseq_t *iseq); return iseq != NULL - && simple_iseq_p(iseq) && !(ci->flag & VM_CALL_KW_SPLAT) /* top of vm_callee_setup_arg */ + && rb_simple_iseq_p(iseq) && !(ci->flag & VM_CALL_KW_SPLAT) /* top of vm_callee_setup_arg */ && (!IS_ARGS_SPLAT(ci) && !IS_ARGS_KEYWORD(ci) && !(METHOD_ENTRY_VISI(cc->me) == METHOD_VISI_PROTECTED)); /* CI_SET_FASTPATH */ } diff --git a/vm_insnhelper.c b/vm_insnhelper.c index bc54acb0a9..c14f05e3aa 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1598,7 +1598,7 @@ vm_call_iseq_setup_normal_0start(rb_execution_context_t *ec, rb_control_frame_t } int -simple_iseq_p(const rb_iseq_t *iseq) +rb_simple_iseq_p(const rb_iseq_t *iseq) { return iseq->body->param.flags.has_opt == FALSE && iseq->body->param.flags.has_rest == FALSE && @@ -1612,7 +1612,7 @@ static inline int vm_callee_setup_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, const struct rb_call_info *ci, struct rb_call_cache *cc, const rb_iseq_t *iseq, VALUE *argv, int param_size, int local_size) { - if (LIKELY(simple_iseq_p(iseq) && !(ci->flag & VM_CALL_KW_SPLAT))) { + if (LIKELY(rb_simple_iseq_p(iseq) && !(ci->flag & VM_CALL_KW_SPLAT))) { rb_control_frame_t *cfp = ec->cfp; CALLER_SETUP_ARG(cfp, calling, ci); /* splat arg */ @@ -2604,7 +2604,7 @@ vm_callee_setup_block_arg_arg0_check(VALUE *argv) static int vm_callee_setup_block_arg(rb_execution_context_t *ec, struct rb_calling_info *calling, const struct rb_call_info *ci, const rb_iseq_t *iseq, VALUE *argv, const enum arg_setup_type arg_setup_type) { - if (simple_iseq_p(iseq)) { + if (rb_simple_iseq_p(iseq)) { rb_control_frame_t *cfp = ec->cfp; VALUE arg0; |