From 550b07ae1b1c72bce45169a8eeacb70e2a4a116f Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 25 Mar 2015 01:57:05 +0300 Subject: [PATCH] cleanup --- Zend/zend_API.h | 3 +-- Zend/zend_opcode.c | 1 - Zend/zend_vm_def.h | 7 +------ Zend/zend_vm_execute.h | 35 +++-------------------------------- 4 files changed, 5 insertions(+), 41 deletions(-) diff --git a/Zend/zend_API.h b/Zend/zend_API.h index bd90e953fe..7513fd0011 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -677,8 +677,7 @@ END_EXTERN_C() /* Fast parameter parsing API */ -/* TODO: This API is experimental. It may be changed or removed ??? - * It should be used only for really often used functions. +/* This API should be used only for really often used functions. * (Keep the original parsing code and wrap usage with #ifndef FAST_ZPP) */ #define FAST_ZPP 1 diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 1a499b9f19..35c42fe4d7 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -117,7 +117,6 @@ ZEND_API void zend_function_dtor(zval *zv) ZEND_ASSERT(function->common.function_name); destroy_op_array(&function->op_array); /* op_arrays are allocated on arena, so we don't have to free them */ -//??? efree_size(function, sizeof(zend_op_array)); } else { ZEND_ASSERT(function->type == ZEND_INTERNAL_FUNCTION); ZEND_ASSERT(function->common.function_name); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index d8eb40a3d5..8c1f1b4a8f 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3595,8 +3595,6 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, ANY, ANY) if (!RETURN_VALUE_USED(opline)) { zval_ptr_dtor(EX_VAR(opline->result.var)); } else { -//??? Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); -//??? Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); Z_VAR_FLAGS_P(EX_VAR(opline->result.var)) = 0; } } @@ -5209,7 +5207,7 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMPVAR|CV, ANY) return_value = EX_VAR(opline->result.var); } - new_op_array->scope = EG(scope); /* ??? */ + new_op_array->scope = EG(scope); call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_CODE, (zend_function*)new_op_array, 0, EX(called_scope), Z_OBJ(EX(This)), NULL); @@ -5393,9 +5391,6 @@ ZEND_VM_C_LABEL(num_index_dim): if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if (OP2_TYPE == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (OP1_TYPE != IS_UNUSED && Z_ISREF_P(container)) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index d2c93b0010..31ee053ef4 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -888,8 +888,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_DO_FCALL_SPEC_HANDLER(ZEND_OPC if (!RETURN_VALUE_USED(opline)) { zval_ptr_dtor(EX_VAR(opline->result.var)); } else { -//??? Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); -//??? Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); Z_VAR_FLAGS_P(EX_VAR(opline->result.var)) = 0; } } @@ -3380,7 +3378,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HAN return_value = EX_VAR(opline->result.var); } - new_op_array->scope = EG(scope); /* ??? */ + new_op_array->scope = EG(scope); call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_CODE, (zend_function*)new_op_array, 0, EX(called_scope), Z_OBJ(EX(This)), NULL); @@ -16184,9 +16182,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if (IS_CONST == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_VAR != IS_UNUSED && Z_ISREF_P(container)) { @@ -19278,9 +19273,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if (IS_CV == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_VAR != IS_UNUSED && Z_ISREF_P(container)) { @@ -20840,9 +20832,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_VAR != IS_UNUSED && Z_ISREF_P(container)) { @@ -22165,9 +22154,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if (IS_CONST == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_UNUSED != IS_UNUSED && Z_ISREF_P(container)) { @@ -24355,9 +24341,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if (IS_CV == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_UNUSED != IS_UNUSED && Z_ISREF_P(container)) { @@ -25768,9 +25751,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_UNUSED != IS_UNUSED && Z_ISREF_P(container)) { @@ -27047,7 +27027,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLE return_value = EX_VAR(opline->result.var); } - new_op_array->scope = EG(scope); /* ??? */ + new_op_array->scope = EG(scope); call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_CODE, (zend_function*)new_op_array, 0, EX(called_scope), Z_OBJ(EX(This)), NULL); @@ -29951,9 +29931,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if (IS_CONST == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_CV != IS_UNUSED && Z_ISREF_P(container)) { @@ -34685,9 +34662,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if (IS_CV == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_CV != IS_UNUSED && Z_ISREF_P(container)) { @@ -37104,9 +37078,6 @@ num_index_dim: if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) { zend_error(E_EXCEPTION | E_ERROR, "Cannot use object as array"); } else { -//??? if ((IS_TMP_VAR|IS_VAR) == IS_CONST) { -//??? zval_copy_ctor(offset); -//??? } Z_OBJ_HT_P(container)->unset_dimension(container, offset); } } else if (IS_CV != IS_UNUSED && Z_ISREF_P(container)) { @@ -37788,7 +37759,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_TMPVAR_HA return_value = EX_VAR(opline->result.var); } - new_op_array->scope = EG(scope); /* ??? */ + new_op_array->scope = EG(scope); call = zend_vm_stack_push_call_frame(ZEND_CALL_NESTED_CODE, (zend_function*)new_op_array, 0, EX(called_scope), Z_OBJ(EX(This)), NULL); -- 2.40.0