diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-27 10:49:55 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-27 10:49:55 +0000 |
| commit | 04d79490da2013588fe9962580dc15193674fde0 (patch) | |
| tree | 89e3b5f2ae815eac1ff4559789ee290380b7fe75 /vm_trace.c | |
| parent | ed8c211a645cfb0528128306789d73441afadf31 (diff) | |
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
Diffstat (limited to 'vm_trace.c')
| -rw-r--r-- | vm_trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |