diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-16 19:29:32 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-01-16 19:29:32 +0000 |
commit | 8cc9818463fc72c08118ae83cd6a1d8c91106d86 (patch) | |
tree | 9eadedbc19286c24b3799056df723e5f0ef5db1f /eval_error.c | |
parent | bc059aa6d5a5987628b19108b5448915ae3012af (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_3@57347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_error.c')
-rw-r--r-- | eval_error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eval_error.c b/eval_error.c index b7f4d5b38f..6708559f31 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; |