diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-20 15:04:07 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-09-20 15:04:07 +0000 |
| commit | e0d1292e35eb4b79d2723823489f4fc8fcb1708c (patch) | |
| tree | 5ca5d1762d0ebfd885925c72273ce44ceeb70dbf /vm_insnhelper.c | |
| parent | b4519b3b8a5de46789d0fb1ddc3723fda761f5a7 (diff) | |
merge revision(s) r33303:
------------------------------------------------------------------------
r33303 | naruse | 2011-09-20 21:16:08 +0900 (Tue, 20 Sep 2011) | 3 lines
Avoid cfp consistency error by LLVM.
volatile is not enough.
------------------------------------------------------------------------
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33304 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 38af0db5a7..5ce46d6331 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); |