kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

Eliminate the possibility to leave freed ISeq 

in active_units

Hoping to fix:
http://ci.rvm.jp/results/trunk-mjit@silicon-docker/2311375
This commit is contained in:
Takashi Kokubun 2019-10-13 19:29:46 -07:00
parent 183b421509
commit 6fa3492362
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mjit_worker.c
View File

@ -1107,11 +1107,8 @@ convert_unit_to_func(struct rb_mjit_unit *unit)
remove_so_file(so_file, unit); remove_so_file(so_file, unit);
if ((uintptr_t)func > (uintptr_t)LAST_JIT_ISEQ_FUNC) { if ((uintptr_t)func > (uintptr_t)LAST_JIT_ISEQ_FUNC) {
CRITICAL_SECTION_START(3, "end of jit");
add_to_list(unit, &active_units);
verbose(1, "JIT success (%.1fms): %s@%s:%ld -> %s", verbose(1, "JIT success (%.1fms): %s@%s:%ld -> %s",
end_time - start_time, iseq_label, iseq_path, iseq_lineno, c_file); end_time - start_time, iseq_label, iseq_path, iseq_lineno, c_file);
CRITICAL_SECTION_FINISH(3, "end of jit");
} }
return (mjit_func_t)func; return (mjit_func_t)func;
} }
@ -1233,6 +1230,9 @@ mjit_worker(void)
rb_native_cond_wait(&mjit_gc_wakeup, &mjit_engine_mutex); rb_native_cond_wait(&mjit_gc_wakeup, &mjit_engine_mutex);
} }
if (unit->iseq) { // Check whether GCed or not if (unit->iseq) { // Check whether GCed or not
if ((uintptr_t)func > (uintptr_t)LAST_JIT_ISEQ_FUNC) {
add_to_list(unit, &active_units);
}
// Usage of jit_code might be not in a critical section. // Usage of jit_code might be not in a critical section.
MJIT_ATOMIC_SET(unit->iseq->body->jit_func, func); MJIT_ATOMIC_SET(unit->iseq->body->jit_func, func);
} }