1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* cont.c, vm_core.h, eval.c: because rb_protect must not be jumped by

Browse Source 
callcc, revert r26407.  And rename trap_tag to protect_tag and
  change exception message (across trap -> across stack rewinding
  barrier).

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-01-25 18:22:58 +00:00
parent 6ebdbb30ad
commit f53d825447
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Jan 26 03:16:45 2010 Yusuke Endoh <mame@tsg.ne.jp>
* cont.c, vm_core.h, eval.c: because rb_protect must not be jumped by
callcc, revert r26407. And rename trap_tag to protect_tag and
change exception message (across trap -> across stack rewinding
barrier).
Mon Jan 25 23:08:10 2010 NAKAMURA Usaku <usa@ruby-lang.org> Mon Jan 25 23:08:10 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* thread.c (do_select): wrong conditions. [ruby-core:27753] * thread.c (do_select): wrong conditions. [ruby-core:27753]

7
cont.c
View File

@ -388,6 +388,7 @@ cont_restore_1(rb_context_t *cont)
th->state = sth->state; th->state = sth->state;
th->status = sth->status; th->status = sth->status;
th->tag = sth->tag; th->tag = sth->tag;
th->protect_tag = sth->protect_tag;
th->errinfo = sth->errinfo; th->errinfo = sth->errinfo;
th->first_proc = sth->first_proc; th->first_proc = sth->first_proc;
@ -620,6 +621,9 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
if (cont->saved_thread.self != th->self) { if (cont->saved_thread.self != th->self) {
rb_raise(rb_eRuntimeError, "continuation called across threads"); rb_raise(rb_eRuntimeError, "continuation called across threads");
} }
if (cont->saved_thread.protect_tag != th->protect_tag) {
rb_raise(rb_eRuntimeError, "continuation called across stack rewinding barrier");
}
if (cont->saved_thread.fiber) { if (cont->saved_thread.fiber) {
rb_fiber_t *fcont; rb_fiber_t *fcont;
GetFiberPtr(cont->saved_thread.fiber, fcont); GetFiberPtr(cont->saved_thread.fiber, fcont);
@ -936,6 +940,9 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
if (cont->saved_thread.self != th->self) { if (cont->saved_thread.self != th->self) {
rb_raise(rb_eFiberError, "fiber called across threads"); rb_raise(rb_eFiberError, "fiber called across threads");
} }
else if (cont->saved_thread.protect_tag != th->protect_tag) {
rb_raise(rb_eFiberError, "fiber called across stack rewinding barrier");
}
else if (fib->status == TERMINATED) { else if (fib->status == TERMINATED) {
value = rb_exc_new2(rb_eFiberError, "dead fiber called"); value = rb_exc_new2(rb_eFiberError, "dead fiber called");
if (th->fiber != fibval) rb_exc_raise(value); if (th->fiber != fibval) rb_exc_raise(value);

5
eval.c
View File

@ -690,14 +690,19 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
int status; int status;
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
rb_control_frame_t *cfp = th->cfp; rb_control_frame_t *cfp = th->cfp;
struct rb_vm_protect_tag protect_tag;
rb_jmpbuf_t org_jmpbuf; rb_jmpbuf_t org_jmpbuf;
protect_tag.prev = th->protect_tag;
PUSH_TAG(); PUSH_TAG();
th->protect_tag = &protect_tag;
MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1); MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1);
if ((status = EXEC_TAG()) == 0) { if ((status = EXEC_TAG()) == 0) {
SAVE_ROOT_JMPBUF(th, result = (*proc) (data)); SAVE_ROOT_JMPBUF(th, result = (*proc) (data));
} }
MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1); MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1);
th->protect_tag = protect_tag.prev;
POP_TAG(); POP_TAG();
if (state) { if (state) {

5
vm_core.h
View File

@ -347,6 +347,10 @@ struct rb_vm_tag {
struct rb_vm_tag *prev; struct rb_vm_tag *prev;
}; };
struct rb_vm_protect_tag {
struct rb_vm_protect_tag *prev;
};
#define RUBY_VM_VALUE_CACHE_SIZE 0x1000 #define RUBY_VM_VALUE_CACHE_SIZE 0x1000
#define USE_VALUE_CACHE 0 #define USE_VALUE_CACHE 0
@ -410,6 +414,7 @@ typedef struct rb_thread_struct
int transition_for_lock; int transition_for_lock;
struct rb_vm_tag *tag; struct rb_vm_tag *tag;
struct rb_vm_protect_tag *protect_tag;
int parse_in_eval; int parse_in_eval;
int mild_compile_error; int mild_compile_error;