merge revision(s) 56561: [Backport #12893]

	* cont.c (cont_new): disable optimization if clang's version is
	  3.8.0.  [ruby-core:77894] [Bug #12893]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@56730 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 34f6d3f578..f7e91b433a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 12 07:47:19 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* cont.c (cont_new): disable optimization if clang's version is
+	  3.8.0.  [ruby-core:77894] [Bug #12893]
+
 Sat Nov 12 07:37:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* sprintf.c (rb_str_format): format exact number more exactly.
diff --git a/cont.c b/cont.c
index 28bc741e59..bfa37d1a87 100644
--- a/cont.c
+++ b/cont.c
@@ -479,6 +479,10 @@ 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
 {
     rb_context_t *cont;
     rb_thread_t *th = GET_THREAD();
diff --git a/version.h b/version.h
index 0249ad3441..1e1823484c 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-11-12"
-#define RUBY_PATCHLEVEL 388
+#define RUBY_PATCHLEVEL 389
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 11