diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-20 12:16:08 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-20 12:16:08 +0000 |
| commit | 192292af762eac6c082b96fe18d29c90ab3f33dd (patch) | |
| tree | 8cb71d3ca046b664271b6650e30e471a87dfe76c /vm_insnhelper.c | |
| parent | f9576738263a1ce2bdd24ae356e749331120182e (diff) | |
Avoid cfp consistency error by LLVM.
volatile is not enough.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_insnhelper.c')
| -rw-r--r-- | vm_insnhelper.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 9a6661e79b..0ba2ae4080 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -386,7 +386,7 @@ call_cfunc(VALUE (*func)(), VALUE recv, } static inline VALUE -vm_call_cfunc(rb_thread_t *th, volatile rb_control_frame_t *reg_cfp, +vm_call_cfunc(rb_thread_t *th, rb_control_frame_t *reg_cfp, int num, volatile VALUE recv, const rb_block_t *blockptr, const rb_method_entry_t *me) { @@ -406,6 +406,10 @@ vm_call_cfunc(rb_thread_t *th, volatile rb_control_frame_t *reg_cfp, if (reg_cfp != th->cfp + 1) { rb_bug("cfp consistency error - send"); } +#ifdef __llvm__ +#define RB_LLVM_GUARD(v) RB_GC_GUARD(v) + RB_LLVM_GUARD(reg_cfp); +#endif vm_pop_frame(th); |