suppress warning: assigned but unused variable - line

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 9 deletions

diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb
index 70f990bfff..1d19af1e10 100644
--- a/test/readline/test_readline.rb
+++ b/test/readline/test_readline.rb
@@ -100,7 +100,7 @@ class TestReadline < Test::Unit::TestCase
         stdin.write("first second\t")
         stdin.flush
         Readline.completion_append_character = nil
-        line = replace_stdio(stdin.path, stdout.path) {
+        replace_stdio(stdin.path, stdout.path) {
           Readline.readline("> ", false)
         }
         assert_equal("second", actual_text)
diff --git a/vm.c b/vm.c
index 0d942a9bfb..c74be32b3d 100644
--- a/vm.c
+++ b/vm.c
@@ -1006,6 +1006,10 @@ 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,
@@ -1037,11 +1041,11 @@ invoke_iseq_block_from_c(rb_thread_t *th, const struct rb_captured_block *captur
     }
 }
 
-static inline VALUE
+ALWAYS_INLINE(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)) {
diff --git a/vm_eval.c b/vm_eval.c
index 1948c4215b..c522c5fce4 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -15,11 +15,11 @@ struct local_var_list {
     VALUE tbl;
 };
 
-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 __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 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 inline VALUE
+static __attribute__((always_inline)) VALUE
 rb_yield_0(int argc, const VALUE * argv)
 {
     return vm_yield(GET_THREAD(), argc, argv);