From 04d79490da2013588fe9962580dc15193674fde0 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 27 Dec 2016 10:49:55 +0000 Subject: merge revision(s) 57020,57021: [Backport #13014] Add clang volatile fixes from FreeBSD and NetBSD. Use volatile instead of optnone to avoid optimization which causes segmentation faults. Patch by Dimitry Andric. [ruby-core:78531] [Bug #13014] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@57216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ cont.c | 10 +++------- eval.c | 4 ++-- eval_error.c | 2 +- thread.c | 4 ++-- version.h | 2 +- vm_eval.c | 4 ++-- vm_trace.c | 2 +- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68aca35b79..44b90606c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Tue Dec 27 19:49:01 2016 Shugo Maeda + + * cont.c, eval.c, eval_error.c, thread.c, vm_eval.c, vm_trace.c: add + clang volatile fixes from FreeBSD and NetBSD. + + Use volatile instead of optnone to avoid optimization which causes + segmentation faults. + Patch by Dimitry Andric. [Bug #13014] + Tue Dec 27 19:40:09 2016 Nobuyoshi Nakada * README.EXT{.ja,}: [DOC] optional keyword arguments are defaulted to diff --git a/cont.c b/cont.c index bfa37d1a87..84a10a4ff9 100644 --- a/cont.c +++ b/cont.c @@ -167,7 +167,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(volatile int *volatile stat)); #define THREAD_MUST_BE_RUNNING(th) do { \ if (!(th)->tag) rb_raise(rb_eThreadError, "not running thread"); \ @@ -478,13 +478,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(volatile int *volatile stat) { - rb_context_t *cont; + rb_context_t *volatile cont; rb_thread_t *th = GET_THREAD(); volatile VALUE contval; diff --git a/eval.c b/eval.c index 9fb819ae84..fbd28565ed 100644 --- a/eval.c +++ b/eval.c @@ -814,7 +814,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; @@ -880,7 +880,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 241c90c36f..2a638f3768 100644 --- a/eval_error.c +++ b/eval_error.c @@ -65,7 +65,7 @@ error_print(void) volatile VALUE errat = Qundef; rb_thread_t *th = GET_THREAD(); VALUE errinfo = th->errinfo; - 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; diff --git a/thread.c b/thread.c index b2d01961ff..ad1e500bc3 100644 --- a/thread.c +++ b/thread.c @@ -462,8 +462,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; if (vm->main_thread != th) { rb_bug("rb_thread_terminate_all: called by child thread (%p, %p)", diff --git a/version.h b/version.h index 0a35fc4456..202743fbc4 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.7" #define RUBY_RELEASE_DATE "2016-12-27" -#define RUBY_PATCHLEVEL 406 +#define RUBY_PATCHLEVEL 407 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 12 diff --git a/vm_eval.c b/vm_eval.c index 94a9c159fc..66b223772d 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1239,7 +1239,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *const cref_arg, int state; VALUE result = Qundef; VALUE envval; - rb_thread_t *th = GET_THREAD(); + rb_thread_t *volatile th = GET_THREAD(); rb_env_t *env = NULL; rb_block_t block, *base_block; volatile int parse_in_eval; @@ -1984,7 +1984,7 @@ rb_catch_protect(VALUE t, rb_block_call_func *func, VALUE data, int *stateptr) int state; volatile VALUE val = Qnil; /* OK */ rb_thread_t *th = GET_THREAD(); - rb_control_frame_t *saved_cfp = th->cfp; + rb_control_frame_t *volatile saved_cfp = th->cfp; volatile VALUE tag = t; TH_PUSH_TAG(th); diff --git a/vm_trace.c b/vm_trace.c index 3c0287d69c..3b0eadfea7 100644 --- a/vm_trace.c +++ b/vm_trace.c @@ -390,7 +390,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; -- cgit v1.2.3