Resurrect r67287 and r67288

I noticed that r67287 was illegal because memory allocated by `alloca`
was used after the stack is expired.

So I just replaced that with `malloc` and `free` for now.

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

1 files changed, 9 insertions, 3 deletions

diff --git a/mjit_compile.c b/mjit_compile.c
index c551ea89c3..4ad083694e 100644
--- a/mjit_compile.c
+++ b/mjit_compile.c
@@ -196,10 +196,14 @@ compile_cancel_handler(FILE *f, const struct rb_iseq_constant_body *body, struct
     fprintf(f, "    return Qundef;\n");
 }
 
+extern bool mjit_copy_cache_from_main_thread(const rb_iseq_t *iseq, struct rb_call_cache **cc_entries, union iseq_inline_storage_entry **is_entries);
+
 // Compile ISeq to C code in `f`. It returns true if it succeeds to compile.
 bool
-mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *funcname, struct rb_call_cache *cc_entries, union iseq_inline_storage_entry *is_entries)
+mjit_compile(FILE *f, const rb_iseq_t *iseq, const char *funcname)
 {
+    const struct rb_iseq_constant_body *body = iseq->body;
+
     struct compile_status status;
     status.success = true;
     status.local_stack_p = !body->catch_except_p;
@@ -207,8 +211,8 @@ mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *func
     if (status.stack_size_for_pos == NULL)
         return false;
     memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size);
-    status.cc_entries = cc_entries;
-    status.is_entries = is_entries;
+    if (mjit_copy_cache_from_main_thread(iseq, &status.cc_entries, &status.is_entries) == false)
+        return false;
 
     /* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */
     if (!mjit_opts.debug) {
@@ -248,6 +252,8 @@ mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *func
     fprintf(f, "\n} /* end of %s */\n", funcname);
 
     free(status.stack_size_for_pos);
+    free(status.cc_entries);
+    free(status.is_entries);
     return status.success;
 }