diff --git a/ChangeLog b/ChangeLog
index 570ff10ae1..586b087245 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sun Oct 11 08:48:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Oct 11 09:04:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (RB_GC_GUARD_PTR): workaround for gcc
+	  optimization.
 
 	* include/ruby/ruby.h (ruby_exec_node): declared.
 
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 6e86cbeec6..19f146e4ad 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -387,7 +387,13 @@ enum ruby_value_type {
 static inline int rb_type(VALUE obj);
 #define TYPE(x) rb_type((VALUE)(x))
 
-#define RB_GC_GUARD(v) (*(volatile VALUE *)&(v))
+#ifdef __GNUC__
+#define RB_GC_GUARD_PTR(ptr) \
+    __extension__ ({volatile VALUE *rb_gc_guarded_ptr = (ptr); rb_gc_guarded_ptr;})
+#else
+#define RB_GC_GUARD_PTR(ptr) (volatile VALUE *)(ptr)
+#endif
+#define RB_GC_GUARD(v) (*RB_GC_GUARD_PTR(&(v)))
 
 void rb_check_type(VALUE,int);
 #define Check_Type(v,t) rb_check_type((VALUE)(v),t)