usa	2016-11-12 07:47:30 +0900 (Sat, 12 Nov 2016)

  New Revision: 56730

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56730

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/cont.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 56729)
+++ ruby_2_2/version.h	(revision 56730)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 56729)
+++ ruby_2_2/ChangeLog	(revision 56730)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Nov 12 07:47:19 2016  Shugo Maeda  <shugo@r...>
+
+	* 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@r...>
 
 	* sprintf.c (rb_str_format): format exact number more exactly.
Index: ruby_2_2/cont.c
===================================================================
--- ruby_2_2/cont.c	(revision 56729)
+++ ruby_2_2/cont.c	(revision 56730)
@@ -479,6 +479,10 @@ cont_new(VALUE klass) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/cont.c#L479
 
 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();

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56561


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/