1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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
This commit is contained in:
naruse 2011-09-20 12:16:08 +00:00
parent f957673826
commit 192292af76

View file

@ -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);