diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-27 18:02:42 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-27 18:02:42 +0000 |
| commit | a5a7e2cd91173f12eb0007f8a55f36b84a3fab13 (patch) | |
| tree | 64fb9061ed5f6b4c583050d90256ca802f1f13ba | |
| parent | 344191d18ef6bf7369122c58b9836f4ab3571e9a (diff) | |
* vm_insnhelper.c (vm_call_cfunc): adding back useless hack. For some
reason, this fixes CFP errors on OS X 10.7.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | vm_insnhelper.c | 4 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Fri Oct 28 03:01:27 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * vm_insnhelper.c (vm_call_cfunc): adding back useless hack. For some + reason, this fixes CFP errors on OS X 10.7. + Fri Oct 28 00:09:31 2011 Tanaka Akira <akr@fsij.org> * ext/sdbm/_sdbm.c (sdbm_prep): refactored for less nesting. diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 250ea3e954..798aaa69d1 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -406,6 +406,10 @@ vm_call_cfunc(rb_thread_t *th, 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_PTR((volatile VALUE *)&(v))) + RB_LLVM_GUARD(reg_cfp); +#endif vm_pop_frame(th); |