From 927fe2422fe8ca3ee50b76c3ee82d3238ea2daca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?=
 <shyouhei@ruby-lang.org>
Date: Mon, 13 Jul 2020 12:27:53 +0900
Subject: [PATCH] mk_builtin_loader.rb: STACK_ADDR_FROM_TOP unusable

Stacks are emulated in MJIT, must not touch the original VM stack.

See also http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/3061353
---
 builtin.h                                          | 2 +-
 tool/mk_builtin_loader.rb                          | 4 ++--
 tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builtin.h b/builtin.h
index 0da200f961..607458ea71 100644
--- a/builtin.h
+++ b/builtin.h
@@ -13,7 +13,7 @@ struct rb_builtin_function {
     const char * const name;
 
     // for jit
-    void (*compiler)(FILE *, long);
+    void (*compiler)(FILE *, long, unsigned);
 };
 
 #define RB_BUILTIN_FUNCTION(_i, _name, _fname, _arity, _compiler) {\
diff --git a/tool/mk_builtin_loader.rb b/tool/mk_builtin_loader.rb
index 18fa36199e..271c47f9ad 100644
--- a/tool/mk_builtin_loader.rb
+++ b/tool/mk_builtin_loader.rb
@@ -286,7 +286,7 @@ def mk_builtin_header file
 
     bs.each_pair{|func, (argc, cfunc_name)|
       f.puts %'static void'
-      f.puts %'mjit_compile_invokebuiltin_for_#{func}(FILE *f, long index)'
+      f.puts %'mjit_compile_invokebuiltin_for_#{func}(FILE *f, long index, unsigned stack_size)'
       f.puts %'{'
       if inlines.has_key? cfunc_name
         f.puts %'    fprintf(f, "    MAYBE_UNUSED(VALUE) self = GET_SELF();\\n");'
@@ -304,7 +304,7 @@ def mk_builtin_header file
         f.puts %'    fprintf(f, "    typedef VALUE (*func)(rb_execution_context_t *, VALUE#{decl});\\n");'
         if argc > 0
           f.puts %'    if (index == -1) {'
-          f.puts %'        fprintf(f, "    const VALUE *argv = STACK_ADDR_FROM_TOP(%d);\\n", #{argc});'
+          f.puts %'        fprintf(f, "    const VALUE *argv = &stack[%d];\\n", stack_size - #{argc});'
           f.puts %'    }'
           f.puts %'    else {'
           f.puts %'        fprintf(f, "    const unsigned int lnum = GET_ISEQ()->body->local_table_size;\\n");'
diff --git a/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb b/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb
index a95a8a7438..29a21b17de 100644
--- a/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb
+++ b/tool/ruby_vm/views/_mjit_compile_invokebuiltin.erb
@@ -19,7 +19,7 @@
             fprintf(f, "    VALUE val;\n");
             bf->compiler(f, <%=
                 insn.name == 'invokebuiltin' ? '-1' : '(rb_num_t)operands[1]'
-            %>);
+            %>, b->stack_size);
             fprintf(f, "    stack[%u] = val;\n", sp - 1);
             fprintf(f, "}\n");
 % if insn.name != 'opt_invokebuiltin_delegate_leave'