tarui	2010-06-29 01:42:34 +0900 (Tue, 29 Jun 2010)

  New Revision: 28467

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28467

  Log:
    merge from trunk (r28423)
    
    * include/ruby/ruby.h (static inline rb_gc_guarded_ptr): prevent
      RB_GC_GUARD_PTR being removed by optimization.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/include/ruby/ruby.h

Index: ruby_1_9_2/include/ruby/ruby.h
===================================================================
--- ruby_1_9_2/include/ruby/ruby.h	(revision 28466)
+++ ruby_1_9_2/include/ruby/ruby.h	(revision 28467)
@@ -420,7 +420,13 @@
 #define RB_GC_GUARD_PTR(ptr) \
     __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;})
 #else
+#ifdef _MSC_VER
+#pragma optimize("", off)
+#endif
 static inline volatile VALUE *rb_gc_guarded_ptr(volatile VALUE *ptr) {return ptr;}
+#ifdef _MSC_VER
+#pragma optimize("", on)
+#endif
 #define RB_GC_GUARD_PTR(ptr) rb_gc_guarded_ptr(ptr)
 #endif
 #define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v)))
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28466)
+++ ruby_1_9_2/ChangeLog	(revision 28467)
@@ -1,3 +1,8 @@
+Tue Jun 29 01:41:42 2010  Masaya Tarui  <tarui@r...>
+
+	* include/ruby/ruby.h (static inline rb_gc_guarded_ptr): prevent
+	  RB_GC_GUARD_PTR being removed by optimization.
+
 Tue Jun 29 01:22:08 2010  Aaron Patterson <aaron@t...>
 
 	* ext/fiddle/fiddle.h: added FFI type detection to avoid bug in ffi

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