summaryrefslogtreecommitdiff
path: root/mjit_worker.c
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2019-05-29 16:47:57 +0900
committerTakashi Kokubun <takashikkbn@gmail.com>2019-05-29 16:48:07 +0900
commit7c0639f3f83f85557aff87e94da1afd373555bcb (patch)
tree6198357df3f059a1dba7a221adc9ef2e05b57524 /mjit_worker.c
parentce7b1132c581375dafa6a5b5071e66eaa362b429 (diff)
Never make a method call from MJIT worker
by showing line number only when it's Fixnum. When it's not Fixnum, we need to call a method to know the line number.
Diffstat (limited to 'mjit_worker.c')
-rw-r--r--mjit_worker.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/mjit_worker.c b/mjit_worker.c
index 0deee99..f99dc66 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -944,13 +944,13 @@ load_func_from_so(const char *so_file, const char *funcname, struct rb_mjit_unit
}
static void
-print_jit_result(const char *result, const struct rb_mjit_unit *unit, const double duration, int lineno, const char *c_file)
+print_jit_result(const char *result, const struct rb_mjit_unit *unit, const double duration, long lineno, const char *c_file)
{
if (unit->iseq == NULL) {
verbose(1, "JIT %s (%.1fms): (GCed) -> %s", result, duration, c_file);
}
else {
- verbose(1, "JIT %s (%.1fms): %s@%s:%d -> %s", result,
+ verbose(1, "JIT %s (%.1fms): %s@%s:%ld -> %s", result,
duration, RSTRING_PTR(unit->iseq->body->location.label),
RSTRING_PTR(rb_iseq_path(unit->iseq)), lineno, c_file);
}
@@ -1075,14 +1075,17 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
return (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC;
}
- // FIX2INT calls method_entry_get(). Thus we should not call it while GC or GC.compact may happen.
- int lineno = FIX2INT(unit->iseq->body->location.first_lineno);
+ // FIX2INT may fallback to rb_num2long(), which is a method call and dangerous in MJIT worker. So showing the
+ // line number only when it's Fixnum. Also note that doing this while in_jit is true to avoid GC / GC.compact.
+ long lineno = 0;
+ if (FIXNUM_P(unit->iseq->body->location.first_lineno))
+ lineno = FIX2LONG(unit->iseq->body->location.first_lineno);
{
VALUE s = rb_iseq_path(unit->iseq);
const char *label = RSTRING_PTR(unit->iseq->body->location.label);
const char *path = RSTRING_PTR(s);
- verbose(2, "start compilation: %s@%s:%d -> %s", label, path, lineno, c_file);
- fprintf(f, "/* %s@%s:%d */\n\n", label, path, lineno);
+ verbose(2, "start compilation: %s@%s:%ld -> %s", label, path, lineno, c_file);
+ fprintf(f, "/* %s@%s:%ld */\n\n", label, path, lineno);
}
bool success = mjit_compile(f, unit->iseq, funcname);