summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-16 01:53:15 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-16 01:53:15 +0000
commitaea98ff0d591a501a0b65c6e7b5e42509cb9afc9 (patch)
tree584fe1b879119f70957b5f060192f59bbc007afa
parent285f139076d0a485270a5638e317ce4e5727d21a (diff)
removed ruby_error_print
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--eval_error.c6
-rw-r--r--internal.h1
-rw-r--r--process.c6
3 files changed, 4 insertions, 9 deletions
diff --git a/eval_error.c b/eval_error.c
index 75864c0f04..cd565ccf95 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -206,12 +206,6 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
rb_thread_raised_set(th, raised_flag);
}
-void
-ruby_error_print(void)
-{
- error_print(GET_THREAD());
-}
-
#define undef_mesg_for(v, k) rb_fstring_cstr("undefined"v" method `%1$s' for "k" `%2$s'")
#define undef_mesg(v) ( \
is_mod ? \
diff --git a/internal.h b/internal.h
index 45d1426b1c..5518825f7e 100644
--- a/internal.h
+++ b/internal.h
@@ -1154,7 +1154,6 @@ VALUE rb_warning_string(const char *fmt, ...);
VALUE rb_refinement_module_get_refined_class(VALUE module);
/* eval_error.c */
-void ruby_error_print(void);
VALUE rb_get_backtrace(VALUE info);
/* eval_jump.c */
diff --git a/process.c b/process.c
index 324d112e0b..7f5c641852 100644
--- a/process.c
+++ b/process.c
@@ -3857,8 +3857,10 @@ rb_f_abort(int argc, const VALUE *argv)
{
rb_check_arity(argc, 0, 1);
if (argc == 0) {
- if (!NIL_P(GET_THREAD()->errinfo)) {
- ruby_error_print();
+ rb_thread_t *th = GET_THREAD();
+ VALUE errinfo = th->errinfo;
+ if (!NIL_P(errinfo)) {
+ rb_threadptr_error_print(th, errinfo);
}
rb_exit(EXIT_FAILURE);
}