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

Prevent the stack from being marked twice

Browse source 
This commit prevents the stack from being marked twice: once via the
Fiber, and once via the Thread.  It introduces an assertion to assert
that the ec on the thread is the same as the ec on the Fiber being
marked via the thread.
This commit is contained in:
Aaron Patterson 2022-07-12 16:42:14 -07:00 committed by Aaron Patterson
parent 32e406d6d3
commit 1341dea771
Notes: git 2022-07-21 05:46:15 +09:00 
Merged: https://github.com/ruby/ruby/pull/6123
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cont.c
View file

@ -1194,6 +1194,12 @@ cont_init_mjit_cont(rb_context_t *cont)
} }
} }
struct rb_execution_context_struct *
rb_fiberptr_get_ec(struct rb_fiber_struct *fiber)
{
return &fiber->cont.saved_ec;
}
static void static void
cont_init(rb_context_t *cont, rb_thread_t *th) cont_init(rb_context_t *cont, rb_thread_t *th)
{ {

2
internal/cont.h
View file

@ -12,6 +12,7 @@
struct rb_thread_struct; /* in vm_core.h */ struct rb_thread_struct; /* in vm_core.h */
struct rb_fiber_struct; /* in cont.c */ struct rb_fiber_struct; /* in cont.c */
struct rb_execution_context_struct; /* in vm_core.c */
/* cont.c */ /* cont.c */
void rb_fiber_reset_root_local_storage(struct rb_thread_struct *); void rb_fiber_reset_root_local_storage(struct rb_thread_struct *);
@ -20,5 +21,6 @@ void rb_fiber_init_mjit_cont(struct rb_fiber_struct *fiber);
VALUE rb_fiberptr_self(struct rb_fiber_struct *fiber); VALUE rb_fiberptr_self(struct rb_fiber_struct *fiber);
unsigned int rb_fiberptr_blocking(struct rb_fiber_struct *fiber); unsigned int rb_fiberptr_blocking(struct rb_fiber_struct *fiber);
struct rb_execution_context_struct * rb_fiberptr_get_ec(struct rb_fiber_struct *fiber);
#endif /* INTERNAL_CONT_H */ #endif /* INTERNAL_CONT_H */

3
vm.c
View file

@ -3138,8 +3138,7 @@ thread_mark(void *ptr)
RUBY_MARK_UNLESS_NULL(th->top_wrapper); RUBY_MARK_UNLESS_NULL(th->top_wrapper);
if (th->root_fiber) rb_fiber_mark_self(th->root_fiber); if (th->root_fiber) rb_fiber_mark_self(th->root_fiber);
/* Ensure EC stack objects are pinned */ RUBY_ASSERT(th->ec == rb_fiberptr_get_ec(th->ec->fiber_ptr));
rb_execution_context_mark(th->ec);
RUBY_MARK_UNLESS_NULL(th->stat_insn_usage); RUBY_MARK_UNLESS_NULL(th->stat_insn_usage);
RUBY_MARK_UNLESS_NULL(th->last_status); RUBY_MARK_UNLESS_NULL(th->last_status);
RUBY_MARK_UNLESS_NULL(th->locking_mutex); RUBY_MARK_UNLESS_NULL(th->locking_mutex);