Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

* thread.c (rb_threadptr_execute_interrupts_common):

  test_signal_requiring of test/ruby/test_signal.rb fail if the sub
  process is killed on waiting IO in lex_io_gets in rb_load_file in
  rb_load_internal in require.
  This is because
  (1) the process receive the killing signal in
      rb_thread_io_blocking_region in rb_read_internal in lex_io_gets.
  (2) set th->errinfo as INT2FIX(TAG_FATAL) at
      rb_threadptr_execute_interrupts_common.
  (3) escape rb_load_file in rb_load_internal and jump to EXEC_TAG()
      without set loaded as TRUE.
  (4) call first rb_exc_raise(GET_THREAD()->errinfo); because loaded
      is FALSE as above. this errinfo should be an exception object
      but this is INT2FIX(TAG_FATAL).
  Don't call first rb_exc_raise if GET_THREAD()->errinfo is Fixnum.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 151093b97ed3c394a47d54bc59f299262d964360 1 parent 2650c69
@nurse nurse authored
Showing with 20 additions and 1 deletion.
  1. +18 −0 ChangeLog
  2. +2 −1  load.c
View
18 ChangeLog
@@ -1,3 +1,21 @@
+Sat May 12 05:23:06 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * thread.c (rb_threadptr_execute_interrupts_common):
+ test_signal_requiring of test/ruby/test_signal.rb fail if the sub
+ process is killed on waiting IO in lex_io_gets in rb_load_file in
+ rb_load_internal in require.
+ This is because
+ (1) the process receive the killing signal in
+ rb_thread_io_blocking_region in rb_read_internal in lex_io_gets.
+ (2) set th->errinfo as INT2FIX(TAG_FATAL) at
+ rb_threadptr_execute_interrupts_common.
+ (3) escape rb_load_file in rb_load_internal and jump to EXEC_TAG()
+ without set loaded as TRUE.
+ (4) call first rb_exc_raise(GET_THREAD()->errinfo); because loaded
+ is FALSE as above. this errinfo should be an exception object
+ but this is INT2FIX(TAG_FATAL).
+ Don't call first rb_exc_raise if GET_THREAD()->errinfo is Fixnum.
+
Fri May 11 14:23:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (primary): begin/end block should be isolated from outside.
View
3  load.c
@@ -319,7 +319,8 @@ rb_load_internal(VALUE fname, int wrap)
th->top_self = self;
th->top_wrapper = wrapper;
- if (!loaded) {
+ if (!loaded && !FIXNUM_P(GET_THREAD()->errinfo)) {
+ /* an error on loading don't include INT2FIX(TAG_FATAL) see r35625 */
rb_exc_raise(GET_THREAD()->errinfo);
}
if (state) {
Please sign in to comment.
Something went wrong with that request. Please try again.