summaryrefslogtreecommitdiff
path: root/mjit.c
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-26 15:12:30 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-26 15:12:30 +0000
commit5b12501163912398400332de00128d968b76744e (patch)
tree54da99eec6aebde7ccf6c2809e520cd07a6f712c /mjit.c
parent0e6aba22c6b876a36adc39cac5314ce6e626954c (diff)
Revert "process.c: try to workaroun SEGV by r65994"
This reverts commit 0e6aba22c6b876a36adc39cac5314ce6e626954c. because it didn't help, at all. http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/1480207 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mjit.c')
-rw-r--r--mjit.c37
1 files changed, 13 insertions, 24 deletions
diff --git a/mjit.c b/mjit.c
index f7ae80834f..5fa93a3cfa 100644
--- a/mjit.c
+++ b/mjit.c
@@ -785,29 +785,6 @@ mjit_child_after_fork(void)
start_worker();
}
-/* Half-baked version of mjit_finish(). It just deletes MJIT-related files.
- Caller should disable MJIT because it won't work without the deleted files.
-
- We want to use mjit_finish() for this function's usage but it's somehow broken like:
- http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/1480173 */
-void
-mjit_clean_files(void)
-{
-#ifndef _MSC_VER /* mswin has prebuilt precompiled header */
- if (!mjit_opts.save_temps && getpid() == pch_owner_pid)
- remove_file(pch_file);
-
- xfree(header_file); header_file = NULL;
-#endif
- xfree(tmp_dir); tmp_dir = NULL;
- xfree(pch_file); pch_file = NULL;
-
- mjit_call_p = FALSE;
- free_list(&unit_queue);
- free_list(&active_units);
- free_list(&compact_units);
-}
-
/* Finish the threads processing units and creating PCH, finalize
and free MJIT data. It should be called last during MJIT
life. */
@@ -840,7 +817,19 @@ mjit_finish(void)
rb_native_cond_destroy(&mjit_worker_wakeup);
rb_native_cond_destroy(&mjit_gc_wakeup);
- mjit_clean_files();
+#ifndef _MSC_VER /* mswin has prebuilt precompiled header */
+ if (!mjit_opts.save_temps && getpid() == pch_owner_pid)
+ remove_file(pch_file);
+
+ xfree(header_file); header_file = NULL;
+#endif
+ xfree(tmp_dir); tmp_dir = NULL;
+ xfree(pch_file); pch_file = NULL;
+
+ mjit_call_p = FALSE;
+ free_list(&unit_queue);
+ free_list(&active_units);
+ free_list(&compact_units);
finish_conts();
mjit_enabled = FALSE;