diff options
| -rw-r--r-- | version.h | 4 | ||||
| -rw-r--r-- | vm_insnhelper.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" #define RUBY_PATCHLEVEL -1 -#define RUBY_RELEASE_DATE "2011-09-17" +#define RUBY_RELEASE_DATE "2011-09-21" #define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 21 #include "ruby/version.h" 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); |