From 8af67e3072e7c6a778c72de01e32988a70dd5bc5 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 24 Dec 2011 03:38:56 +0000 Subject: * proc.c (proc_call): get rid of optimazation-out by clang. * proc.c (rb_proc_call, rb_proc_call_with_block): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ proc.c | 17 ++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 40d3ab14ad..58e7441f2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Dec 24 12:38:53 2011 Nobuyoshi Nakada + + * proc.c (proc_call): get rid of optimazation-out by clang. + + * proc.c (rb_proc_call, rb_proc_call_with_block): ditto. + Sat Dec 24 10:56:32 2011 Nobuyoshi Nakada * ext/readline/readline.c (readline_readline): check if outstream diff --git a/proc.c b/proc.c index 228d02ce94..cdbf40e4a4 100644 --- a/proc.c +++ b/proc.c @@ -544,6 +544,7 @@ proc_lambda(void) static VALUE proc_call(int argc, VALUE *argv, VALUE procval) { + VALUE vret; rb_proc_t *proc; rb_block_t *blockptr = 0; rb_iseq_t *iseq; @@ -560,8 +561,10 @@ proc_call(int argc, VALUE *argv, VALUE procval) } } - return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, + vret = rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, argc, argv, blockptr); + RB_GC_GUARD(procval); + return vret; } #if SIZEOF_LONG > SIZEOF_INT @@ -581,15 +584,20 @@ check_argc(long argc) VALUE rb_proc_call(VALUE self, VALUE args) { + VALUE vret; rb_proc_t *proc; GetProcPtr(self, proc); - return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, + vret = rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, check_argc(RARRAY_LEN(args)), RARRAY_PTR(args), 0); + RB_GC_GUARD(self); + RB_GC_GUARD(args); + return vret; } VALUE rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval) { + VALUE vret; rb_proc_t *proc; rb_block_t *block = 0; GetProcPtr(self, proc); @@ -600,8 +608,11 @@ rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval) block = &pass_proc->block; } - return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, + vret = rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self, argc, argv, block); + RB_GC_GUARD(self); + RB_GC_GUARD(pass_procval); + return vret; } /* -- cgit v1.2.3