diff options
| author | Nikita Popov <nikic@php.net> | 2016-04-18 22:46:36 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-04-18 22:46:36 +0200 |
| commit | d79288c6bb4186a7f962445bb03bfbaa12b1ce4d (patch) | |
| tree | c2518941cb4a5d5f7afd3f2a508b2f12ffbba4b9 /Zend/zend_vm_def.h | |
| parent | 5a538e1d8221ddc6195036c516a8eab122bf39b5 (diff) | |
| parent | 73958ca62d3483c46e10a20f5690fe8c8103baad (diff) | |
| download | php-git-d79288c6bb4186a7f962445bb03bfbaa12b1ce4d.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'Zend/zend_vm_def.h')
| -rw-r--r-- | Zend/zend_vm_def.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 87ec9d994f..2b91605207 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4621,7 +4621,6 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, NUM) if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) { if (UNEXPECTED(!Z_ISREF_P(arg))) { - if (!ARG_MAY_BE_SENT_BY_REF(EX(call)->func, opline->op2.num)) { zend_error(E_WARNING, "Parameter %d to %s%s%s() expected to be a reference, value given", @@ -4644,21 +4643,15 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, VAR|CV, NUM) FREE_OP1(); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); } - - ZVAL_NEW_REF(arg, arg); } - Z_ADDREF_P(arg); } else { if (Z_ISREF_P(arg) && !(EX(call)->func->common.fn_flags & ZEND_ACC_CALL_VIA_TRAMPOLINE)) { /* don't separate references for __call */ arg = Z_REFVAL_P(arg); } - if (Z_OPT_REFCOUNTED_P(arg)) { - Z_ADDREF_P(arg); - } } - ZVAL_COPY_VALUE(param, arg); + ZVAL_COPY(param, arg); FREE_OP1(); ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION(); |