aboutsummaryrefslogtreecommitdiffstats
path: root/process.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 /process.c
parent0e6aba22c6b876a36adc39cac5314ce6e626954c (diff)
downloadruby-5b12501163912398400332de00128d968b76744e.tar.gz
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 'process.c')
-rw-r--r--process.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/process.c b/process.c
index 395649e757..29d8ae6fa4 100644
--- a/process.c
+++ b/process.c
@@ -2944,13 +2944,7 @@ rb_f_exec(int argc, const VALUE *argv)
execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE);
eargp = rb_execarg_get(execarg_obj);
- if (mjit_enabled) {
- /* TODO: Use mjit_finish() here. We're not doing so because it leads SEGV
- http://ci.rvm.jp/results/trunk-mjit-wait@silicon-docker/1480173 and we don't know why. */
- mjit_pause(FALSE); /* do not leak children */
- mjit_clean_files(); /* do not leave files. */
- mjit_enabled = FALSE; /* MJIT won't work without files deleted above. never JIT-able after exec failure + rescue, for now. */
- }
+ if (mjit_enabled) mjit_finish(); /* do not leave files or leak children */
before_exec(); /* stop timer thread before redirects */
rb_execarg_parent_start(execarg_obj);
fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;