From 35f1b8f54660cb0c022bc742c406cab46380c31a Mon Sep 17 00:00:00 2001
From: k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Apr 2018 16:57:59 +0000
Subject: [PATCH] _mjit_compile_send.erb: simplify control flow

to introduce additional optimization for another `cc->me->def->type`
later. I carved out the `cc->me->def->type == VM_METHOD_TYPE_ISEQ`
part because I wanted to check other types as well.

mjit_compile.c: drop get_iseq_if_available and define simplified version
of it, has_valid_method_type.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 mjit_compile.c                            | 14 +++++---------
 tool/ruby_vm/views/_mjit_compile_send.erb |  8 +++++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/mjit_compile.c b/mjit_compile.c
index 014a2e8927..7913e6836b 100644
--- a/mjit_compile.c
+++ b/mjit_compile.c
@@ -39,16 +39,12 @@ struct case_dispatch_var {
     VALUE last_value;
 };
 
-/* Returns iseq from cc if it's available and still not obsoleted. */
-static const rb_iseq_t *
-get_iseq_if_available(CALL_CACHE cc)
+/* Returns TRUE if call cache is still not obsoleted and cc->me->def->type is available. */
+static int
+has_valid_method_type(CALL_CACHE cc)
 {
-    if (GET_GLOBAL_METHOD_STATE() == cc->method_state
-        && mjit_valid_class_serial_p(cc->class_serial)
-        && cc->me && cc->me->def->type == VM_METHOD_TYPE_ISEQ) {
-        return rb_iseq_check(cc->me->def->body.iseq.iseqptr);
-    }
-    return NULL;
+    return GET_GLOBAL_METHOD_STATE() == cc->method_state
+        && mjit_valid_class_serial_p(cc->class_serial) && cc->me;
 }
 
 /* Returns TRUE if iseq is inlinable, otherwise NULL. This becomes TRUE in the same condition
diff --git a/tool/ruby_vm/views/_mjit_compile_send.erb b/tool/ruby_vm/views/_mjit_compile_send.erb
index 5b32ac42db..d26224c084 100644
--- a/tool/ruby_vm/views/_mjit_compile_send.erb
+++ b/tool/ruby_vm/views/_mjit_compile_send.erb
@@ -7,19 +7,20 @@
 % # details.
 %
 % # Optimized case of send / opt_send_without_block instructions.
-    {
+{
 % # compiler: Prepare operands which may be used by `insn.call_attribute`
 % insn.opes.each_with_index do |ope, i|
-        MAYBE_UNUSED(<%= ope.fetch(:decl) %>) = (<%= ope.fetch(:type) %>)operands[<%= i %>];
+    MAYBE_UNUSED(<%= ope.fetch(:decl) %>) = (<%= ope.fetch(:type) %>)operands[<%= i %>];
 % end
 %
+    if (has_valid_method_type(cc)) {
         const rb_iseq_t *iseq;
         unsigned int argc = ci->orig_argc; /* unlike `ci->orig_argc`, `argc` may include blockarg */
 % if insn.name == 'send'
         argc += ((ci->flag & VM_CALL_ARGS_BLOCKARG) ? 1 : 0);
 % end
 
-        if (inlinable_iseq_p(ci, cc, iseq = get_iseq_if_available(cc))) {
+        if (cc->me->def->type == VM_METHOD_TYPE_ISEQ && inlinable_iseq_p(ci, cc, iseq = rb_iseq_check(cc->me->def->body.iseq.iseqptr))) {
             int param_size = iseq->body->param.size; /* TODO: check calling->argc for argument_arity_error */
 
             fprintf(f, "{\n");
@@ -88,3 +89,4 @@
             break;
         }
     }
+}