kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Kernel#abort without arguments should print error info

Browse source 
[Bug #16424]
This commit is contained in:
Nobuyoshi Nakada 2019-12-16 09:44:01 +09:00 • committed by Koichi Sasada
parent 1e80a208cc
commit d2f04d332f
Notes: git 2019-12-16 14:56:24 +09:00
4 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
eval.c
View file

@ -477,7 +477,7 @@ rb_class_modify_check(VALUE klass)
NORETURN(static void rb_longjmp(rb_execution_context_t *, int, volatile VALUE, VALUE)); NORETURN(static void rb_longjmp(rb_execution_context_t *, int, volatile VALUE, VALUE));
static VALUE get_errinfo(void); static VALUE get_errinfo(void);
static VALUE get_ec_errinfo(const rb_execution_context_t *ec); #define get_ec_errinfo(ec) rb_ec_get_errinfo(ec)
static VALUE static VALUE
exc_setup_cause(VALUE exc, VALUE cause) exc_setup_cause(VALUE exc, VALUE cause)
@ -1847,8 +1847,8 @@ errinfo_place(const rb_execution_context_t *ec)
return 0; return 0;
} }
static VALUE VALUE
get_ec_errinfo(const rb_execution_context_t *ec) rb_ec_get_errinfo(const rb_execution_context_t *ec)
{ {
const VALUE *ptr = errinfo_place(ec); const VALUE *ptr = errinfo_place(ec);
if (ptr) { if (ptr) {

2
process.c
View file

@ -4279,7 +4279,7 @@ rb_f_abort(int argc, const VALUE *argv)
rb_check_arity(argc, 0, 1); rb_check_arity(argc, 0, 1);
if (argc == 0) { if (argc == 0) {
rb_execution_context_t *ec = GET_EC(); rb_execution_context_t *ec = GET_EC();
VALUE errinfo = ec->errinfo; VALUE errinfo = rb_ec_get_errinfo(ec);
if (!NIL_P(errinfo)) { if (!NIL_P(errinfo)) {
rb_ec_error_print(ec, errinfo); rb_ec_error_print(ec, errinfo);
} }

12
test/ruby/test_process.rb
View file

@ -1509,7 +1509,17 @@ class TestProcess < Test::Unit::TestCase
def test_abort def test_abort
with_tmpchdir do with_tmpchdir do
s = run_in_child("abort") s = run_in_child("abort")
assert_not_equal(0, s.exitstatus) assert_not_predicate(s, :success?)
write_file("test-script", "#{<<~"begin;"}\n#{<<~'end;'}")
begin;
STDERR.reopen(STDOUT)
begin
raise "[Bug #16424]"
rescue => e
abort
end
end;
assert_include(IO.popen([RUBY, "test-script"], &:read), "[Bug #16424]")
end end
end end

1
vm_core.h
View file

@ -1848,6 +1848,7 @@ void rb_threadptr_interrupt(rb_thread_t *th);
void rb_threadptr_unlock_all_locking_mutexes(rb_thread_t *th); void rb_threadptr_unlock_all_locking_mutexes(rb_thread_t *th);
void rb_threadptr_pending_interrupt_clear(rb_thread_t *th); void rb_threadptr_pending_interrupt_clear(rb_thread_t *th);
void rb_threadptr_pending_interrupt_enque(rb_thread_t *th, VALUE v); void rb_threadptr_pending_interrupt_enque(rb_thread_t *th, VALUE v);
VALUE rb_ec_get_errinfo(const rb_execution_context_t *ec);
void rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo); void rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo);
void rb_execution_context_update(const rb_execution_context_t *ec); void rb_execution_context_update(const rb_execution_context_t *ec);
void rb_execution_context_mark(const rb_execution_context_t *ec); void rb_execution_context_mark(const rb_execution_context_t *ec);