aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-21 17:53:23 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-21 17:53:23 +0000
commit64b7b548e0f5d143a6c18c1d295ed274fac48761 (patch)
treed34eecaa85b47920e98cb1f844d6009d84c3f3f8
parent7f4c92c4782751b4411522f7d38fb4aa0c59a345 (diff)
downloadruby-64b7b548e0f5d143a6c18c1d295ed274fac48761.tar.gz
* vm_insnhelper.c (vm_call_cfunc): suppress a warning. note that
`volatile type *var' doesn't make var itself volatile. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_insnhelper.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2963027f39..65ecd6fba8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 22 02:53:19 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_insnhelper.c (vm_call_cfunc): suppress a warning. note that
+ `volatile type *var' doesn't make var itself volatile.
+
Thu Sep 22 01:52:48 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* thread_pthread.c (ubf_select): activate timer thread when interrupt
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index 0ba2ae4080..d97ac87a2a 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -407,7 +407,7 @@ vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp,
rb_bug("cfp consistency error - send");
}
#ifdef __llvm__
-#define RB_LLVM_GUARD(v) RB_GC_GUARD(v)
+#define RB_LLVM_GUARD(v) (*RB_GC_GUARD_PTR((volatile VALUE *)&(v)))
RB_LLVM_GUARD(reg_cfp);
#endif