diff options
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 31ee053ef4..c628928cd4 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -3100,9 +3100,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_CONST_HANDLER(ZEND_OP if (EXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), &object_zval); - EX(call)->return_value = EX_VAR(opline->result.var); - } else { - EX(call)->return_value = NULL; } CHECK_EXCEPTION(); @@ -5082,10 +5079,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object, EX(call)); - if (IS_CONST == IS_UNUSED) { - EX(call)->return_value = NULL; - } - CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } @@ -6984,10 +6977,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object, EX(call)); - if (IS_UNUSED == IS_UNUSED) { - EX(call)->return_value = NULL; - } - CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } @@ -8466,10 +8455,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object, EX(call)); - if (IS_CV == IS_UNUSED) { - EX(call)->return_value = NULL; - } - CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } @@ -10015,10 +10000,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_C EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object, EX(call)); - if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) { - EX(call)->return_value = NULL; - } - CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } @@ -13795,9 +13776,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NEW_SPEC_VAR_HANDLER(ZEND_OPCO if (EXPECTED(RETURN_VALUE_USED(opline))) { ZVAL_COPY(EX_VAR(opline->result.var), &object_zval); - EX(call)->return_value = EX_VAR(opline->result.var); - } else { - EX(call)->return_value = NULL; } CHECK_EXCEPTION(); @@ -15880,10 +15858,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object, EX(call)); - if (IS_CONST == IS_UNUSED) { - EX(call)->return_value = NULL; - } - CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } @@ -17455,10 +17429,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object, EX(call)); - if (IS_UNUSED == IS_UNUSED) { - EX(call)->return_value = NULL; - } - CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } @@ -19072,10 +19042,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object, EX(call)); - if (IS_CV == IS_UNUSED) { - EX(call)->return_value = NULL; - } - CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } @@ -20631,10 +20597,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_V EX(call) = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_FUNCTION, fbc, opline->extended_value, ce, object, EX(call)); - if ((IS_TMP_VAR|IS_VAR) == IS_UNUSED) { - EX(call)->return_value = NULL; - } - CHECK_EXCEPTION(); ZEND_VM_NEXT_OPCODE(); } |