1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Partially revert "suppress warning: assigned but unused variable - line"

revert unexpected changes

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2017-08-15 21:39:38 +00:00
parent e999899e4e
commit 026979e7cf
2 changed files with 8 additions and 12 deletions

8
vm.c
View file

@ -1006,10 +1006,6 @@ invoke_bmethod(rb_thread_t *th, const rb_iseq_t *iseq, VALUE self, const struct
return ret;
}
ALWAYS_INLINE(static inline VALUE
invoke_iseq_block_from_c(rb_thread_t *th, const struct rb_captured_block *captured,
VALUE self, int argc, const VALUE *argv, VALUE passed_block_handler,
const rb_cref_t *cref, int is_lambda));
static inline VALUE
invoke_iseq_block_from_c(rb_thread_t *th, const struct rb_captured_block *captured,
VALUE self, int argc, const VALUE *argv, VALUE passed_block_handler,
@ -1041,11 +1037,11 @@ invoke_iseq_block_from_c(rb_thread_t *th, const struct rb_captured_block *captur
}
}
ALWAYS_INLINE(static inline VALUE
static inline VALUE
invoke_block_from_c_bh(rb_thread_t *th, VALUE block_handler,
int argc, const VALUE *argv,
VALUE passed_block_handler, const rb_cref_t *cref,
int is_lambda, int force_blockarg))
int is_lambda, int force_blockarg)
{
again:
switch (vm_block_handler_type(block_handler)) {

View file

@ -15,11 +15,11 @@ struct local_var_list {
VALUE tbl;
};
static __attribute__((always_inline)) VALUE method_missing(VALUE obj, ID id, int argc, const VALUE *argv, enum method_missing_reason call_status);
static __attribute__((always_inline)) VALUE vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, const rb_cref_t *cref, int is_lambda);
static __attribute__((always_inline)) VALUE vm_yield(rb_thread_t *th, int argc, const VALUE *argv);
static __attribute__((always_inline)) VALUE vm_yield_with_block(rb_thread_t *th, int argc, const VALUE *argv, VALUE block_handler);
static __attribute__((always_inline)) VALUE vm_yield_force_blockarg(rb_thread_t *th, VALUE args);
static inline VALUE method_missing(VALUE obj, ID id, int argc, const VALUE *argv, enum method_missing_reason call_status);
static inline VALUE vm_yield_with_cref(rb_thread_t *th, int argc, const VALUE *argv, const rb_cref_t *cref, int is_lambda);
static inline VALUE vm_yield(rb_thread_t *th, int argc, const VALUE *argv);
static inline VALUE vm_yield_with_block(rb_thread_t *th, int argc, const VALUE *argv, VALUE block_handler);
static inline VALUE vm_yield_force_blockarg(rb_thread_t *th, VALUE args);
static VALUE vm_exec(rb_thread_t *th);
static void vm_set_eval_stack(rb_thread_t * th, const rb_iseq_t *iseq, const rb_cref_t *cref, const struct rb_block *base_block);
static int vm_collect_local_variables_in_heap(rb_thread_t *th, const VALUE *dfp, const struct local_var_list *vars);
@ -959,7 +959,7 @@ rb_f_public_send(int argc, VALUE *argv, VALUE recv)
/* yield */
static __attribute__((always_inline)) VALUE
static inline VALUE
rb_yield_0(int argc, const VALUE * argv)
{
return vm_yield(GET_THREAD(), argc, argv);