summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--vm_args.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c843e2776d..0736c872e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 17 22:13:10 2015 Shugo Maeda <shugo@ruby-lang.org>
+
+ * vm_args.c (vm_caller_setup_arg_block): remove code for ifunc
+ because it was made unnecessary by r52138.
+
Thu Dec 17 16:13:10 2015 Shugo Maeda <shugo@ruby-lang.org>
* proc.c (rb_block_arity): should not call GetProcPtr() for symbols.
diff --git a/vm_args.c b/vm_args.c
index e0c7448f6b..2546b86e8e 100644
--- a/vm_args.c
+++ b/vm_args.c
@@ -785,11 +785,6 @@ vm_caller_setup_arg_block(const rb_thread_t *th, rb_control_frame_t *reg_cfp,
calling->blockptr->iseq = (rb_iseq_t *)proc;
calling->blockptr->proc = proc;
}
- else if (RUBY_VM_IFUNC_P(proc)) {
- calling->blockptr = RUBY_VM_GET_BLOCK_PTR_IN_CFP(reg_cfp);
- calling->blockptr->iseq = (rb_iseq_t *)proc;
- calling->blockptr->proc = proc;
- }
else {
if (!rb_obj_is_proc(proc)) {
VALUE b;