diff options
| -rw-r--r-- | cont.c | 10 | ||||
| -rw-r--r-- | eval.c | 4 | ||||
| -rw-r--r-- | eval_error.c | 4 | ||||
| -rw-r--r-- | thread.c | 4 | ||||
| -rw-r--r-- | vm_core.h | 2 | ||||
| -rw-r--r-- | vm_eval.c | 8 | ||||
| -rw-r--r-- | vm_trace.c | 2 |
7 files changed, 15 insertions, 19 deletions
@@ -161,7 +161,7 @@ static VALUE rb_eFiberError; if (!(ptr)) rb_raise(rb_eFiberError, "uninitialized fiber"); \ } while (0) -NOINLINE(static VALUE cont_capture(volatile int *stat)); +NOINLINE(static VALUE cont_capture(int *volatile stat)); #define THREAD_MUST_BE_RUNNING(th) do { \ if (!(th)->tag) rb_raise(rb_eThreadError, "not running thread"); \ @@ -470,13 +470,9 @@ cont_new(VALUE klass) } static VALUE -cont_capture(volatile int *stat) -#if defined(__clang__) && \ - __clang_major__ == 3 && __clang_minor__ == 8 && __clang_patch__ == 0 -__attribute__ ((optnone)) -#endif +cont_capture(int *volatile stat) { - rb_context_t *cont; + rb_context_t *volatile cont; rb_thread_t *th = GET_THREAD(); volatile VALUE contval; @@ -813,7 +813,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1, { int state; rb_thread_t *th = GET_THREAD(); - rb_control_frame_t *cfp = th->cfp; + rb_control_frame_t *volatile cfp = th->cfp; volatile VALUE result = Qfalse; volatile VALUE e_info = th->errinfo; va_list args; @@ -879,7 +879,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state) volatile VALUE result = Qnil; volatile int status; rb_thread_t *th = GET_THREAD(); - rb_control_frame_t *cfp = th->cfp; + rb_control_frame_t *volatile cfp = th->cfp; struct rb_vm_protect_tag protect_tag; rb_jmpbuf_t org_jmpbuf; diff --git a/eval_error.c b/eval_error.c index c469474159..ff3db23a6b 100644 --- a/eval_error.c +++ b/eval_error.c @@ -73,10 +73,10 @@ error_print(rb_thread_t *th) } void -rb_threadptr_error_print(rb_thread_t *th, VALUE errinfo) +rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo) { volatile VALUE errat = Qundef; - int raised_flag = th->raised_flag; + volatile int raised_flag = th->raised_flag; volatile VALUE eclass = Qundef, e = Qundef; const char *volatile einfo; volatile long elen; @@ -466,8 +466,8 @@ rb_threadptr_unlock_all_locking_mutexes(rb_thread_t *th) void rb_thread_terminate_all(void) { - rb_thread_t *th = GET_THREAD(); /* main thread */ - rb_vm_t *vm = th->vm; + rb_thread_t *volatile th = GET_THREAD(); /* main thread */ + rb_vm_t *volatile vm = th->vm; volatile int sleeping = 0; if (vm->main_thread != th) { @@ -1562,7 +1562,7 @@ 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_enque(rb_thread_t *th, VALUE v); int rb_threadptr_pending_interrupt_active_p(rb_thread_t *th); -void rb_threadptr_error_print(rb_thread_t *th, VALUE errinfo); +void rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo); #define RUBY_VM_CHECK_INTS(th) ruby_vm_check_ints(th) static inline void @@ -1280,7 +1280,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, rb_cref_t *const cref_ { int state; VALUE result = Qundef; - rb_thread_t *th = GET_THREAD(); + rb_thread_t *volatile th = GET_THREAD(); struct rb_block block; const struct rb_block *base_block; volatile VALUE file; @@ -1997,7 +1997,7 @@ rb_catch(const char *tag, VALUE (*func)(), VALUE data) return rb_catch_obj(vtag, func, data); } -static VALUE vm_catch_protect(VALUE, rb_block_call_func *, VALUE, int *, rb_thread_t *); +static VALUE vm_catch_protect(VALUE, rb_block_call_func *, VALUE, int *, rb_thread_t *volatile); VALUE rb_catch_obj(VALUE t, VALUE (*func)(), VALUE data) @@ -2018,11 +2018,11 @@ rb_catch_protect(VALUE t, rb_block_call_func *func, VALUE data, int *stateptr) static VALUE vm_catch_protect(VALUE tag, rb_block_call_func *func, VALUE data, - int *stateptr, rb_thread_t *th) + int *stateptr, rb_thread_t *volatile th) { int state; VALUE val = Qnil; /* OK */ - rb_control_frame_t *saved_cfp = th->cfp; + rb_control_frame_t *volatile saved_cfp = th->cfp; TH_PUSH_TAG(th); diff --git a/vm_trace.c b/vm_trace.c index aca6367b08..02bf54e968 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -389,7 +389,7 @@ rb_suppress_tracing(VALUE (*func)(VALUE), VALUE arg) volatile int raised; volatile int outer_state; VALUE result = Qnil; - rb_thread_t *th = GET_THREAD(); + rb_thread_t *volatile th = GET_THREAD(); int state; const int tracing = th->trace_arg ? 1 : 0; rb_trace_arg_t dummy_trace_arg; |