diff options
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 158 |
1 files changed, 79 insertions, 79 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 0614e1f3cb..6ce1f99b9c 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -554,7 +554,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR ZVAL_NULL(ret); //??? ret->var.ptr_ptr = &ret->var.ptr; - ret->var_flags = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0 ? IS_VAR_RET_REF : 0; + Z_FLAGS_P(ret) = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0 ? IS_VAR_RET_REF : 0; if (!zend_execute_internal) { /* saves one function call if zend_execute_internal is not used */ @@ -579,7 +579,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR ZVAL_NULL(return_value); //??? ret->var.ptr_ptr = &ret->var.ptr; - return_value->var_flags = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0 ? IS_VAR_RET_REF : 0; + Z_FLAGS_P(return_value) = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0 ? IS_VAR_RET_REF : 0; } if (UNEXPECTED((EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) { @@ -621,7 +621,7 @@ static int ZEND_FASTCALL zend_do_fcall_common_helper_SPEC(ZEND_OPCODE_HANDLER_AR } else { //??? Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr); //??? Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1); - EX_VAR(opline->result.var)->var_flags = 0; + Z_FLAGS_P(EX_VAR(opline->result.var)) = 0; //??? EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr; } } @@ -1198,9 +1198,9 @@ static int ZEND_FASTCALL ZEND_HANDLE_EXCEPTION_SPEC_HANDLER(ZEND_OPCODE_HANDLER if (call->object) { if (call->is_ctor_call) { if (call->is_ctor_result_used) { - call->object->gc.refcount--; + GC_REFCOUNT(call->object)--; } - if (call->object->gc.refcount == 1) { + if (GC_REFCOUNT(call->object) == 1) { zend_object_store_ctor_failed(call->object TSRMLS_CC); } } @@ -1477,7 +1477,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } if (IS_CONST == IS_VAR && 0 && Z_REFCOUNT_P(function_name) == 1 && call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { @@ -1542,7 +1542,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } } @@ -1804,7 +1804,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } if (IS_TMP_VAR == IS_VAR && 1 && Z_REFCOUNT_P(function_name) == 1 && call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { @@ -1869,7 +1869,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } } @@ -1993,7 +1993,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } if (IS_VAR == IS_VAR && (free_op2.var != NULL) && Z_REFCOUNT_P(function_name) == 1 && call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { @@ -2058,7 +2058,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } } @@ -2219,7 +2219,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA Z_OBJ_HANDLER_P(function_name, get_closure) && Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) { if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } if (IS_CV == IS_VAR && 0 && Z_REFCOUNT_P(function_name) == 1 && call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) { @@ -2284,7 +2284,7 @@ static int ZEND_FASTCALL ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } } @@ -2602,7 +2602,7 @@ static int ZEND_FASTCALL ZEND_RETURN_BY_REF_SPEC_CONST_HANDLER(ZEND_OPCODE_HAND if (IS_CONST == IS_VAR && !Z_ISREF_P(retval_ptr)) { if (opline->extended_value == ZEND_RETURNS_FUNCTION && - (retval_ptr->var_flags & IS_VAR_RET_REF)) { + (Z_FLAGS_P(retval_ptr) & IS_VAR_RET_REF)) { //??? } else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { } else { zend_error(E_NOTICE, "Only variable references should be returned by reference"); @@ -2835,7 +2835,7 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HA inc_filename = opline->op1.zv; ZVAL_UNDEF(&tmp_inc_filename); - if (inc_filename->type!=IS_STRING) { + if (Z_TYPE_P(inc_filename) != IS_STRING) { ZVAL_DUP(&tmp_inc_filename, inc_filename); convert_to_string(&tmp_inc_filename); inc_filename = &tmp_inc_filename; @@ -3835,7 +3835,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CONST_HANDLER( } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -4274,7 +4274,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CONST_CONST_HANDLER(ZEND_OPCODE_HANDLE * not return by reference we throw a notice. */ if (IS_CONST == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -4760,7 +4760,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_TMP_HANDLER(ZE } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -4927,7 +4927,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CONST_TMP_HANDLER(ZEND_OPCODE_HANDLER_ * not return by reference we throw a notice. */ if (IS_CONST == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -5592,7 +5592,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_VAR_HANDLER(ZE } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -5906,7 +5906,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CONST_VAR_HANDLER(ZEND_OPCODE_HANDLER_ * not return by reference we throw a notice. */ if (IS_CONST == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -6279,7 +6279,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_UNUSED_HANDLER } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -6595,7 +6595,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CONST_UNUSED_HANDLER(ZEND_OPCODE_HANDL * not return by reference we throw a notice. */ if (IS_CONST == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -7081,7 +7081,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_CONST_CV_HANDLER(ZEN } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -7139,7 +7139,7 @@ static int ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A } ZVAL_OBJ(EX_VAR(opline->op2.var), EG(exception)); if (UNEXPECTED(EG(exception) != exception)) { - EG(exception)->gc.refcount++; + GC_REFCOUNT(EG(exception))++; HANDLE_EXCEPTION(); } else { EG(exception) = NULL; @@ -7301,7 +7301,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A * not return by reference we throw a notice. */ if (IS_CONST == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -7676,7 +7676,7 @@ static int ZEND_FASTCALL ZEND_RETURN_BY_REF_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLE if (IS_TMP_VAR == IS_VAR && !Z_ISREF_P(retval_ptr)) { if (opline->extended_value == ZEND_RETURNS_FUNCTION && - (retval_ptr->var_flags & IS_VAR_RET_REF)) { + (Z_FLAGS_P(retval_ptr) & IS_VAR_RET_REF)) { //??? } else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { } else { zend_error(E_NOTICE, "Only variable references should be returned by reference"); @@ -7910,7 +7910,7 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HAND inc_filename = _get_zval_ptr_tmp(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); ZVAL_UNDEF(&tmp_inc_filename); - if (inc_filename->type!=IS_STRING) { + if (Z_TYPE_P(inc_filename) != IS_STRING) { ZVAL_DUP(&tmp_inc_filename, inc_filename); convert_to_string(&tmp_inc_filename); inc_filename = &tmp_inc_filename; @@ -8953,7 +8953,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CONST_HANDLER(ZEND_OPCO if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -9266,7 +9266,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_CONST_HANDLER(ZEND_OPCODE_HANDLER_ * not return by reference we throw a notice. */ if (IS_TMP_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -9751,7 +9751,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -9919,7 +9919,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_AR * not return by reference we throw a notice. */ if (IS_TMP_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -10583,7 +10583,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -10898,7 +10898,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_AR * not return by reference we throw a notice. */ if (IS_TMP_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -11455,7 +11455,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_UNUSED_HANDLER(ZEND_OPCODE_HANDLER * not return by reference we throw a notice. */ if (IS_TMP_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -11939,7 +11939,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_ if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -12105,7 +12105,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG * not return by reference we throw a notice. */ if (IS_TMP_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -12672,7 +12672,7 @@ static int ZEND_FASTCALL ZEND_RETURN_BY_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLE if (IS_VAR == IS_VAR && !Z_ISREF_P(retval_ptr)) { if (opline->extended_value == ZEND_RETURNS_FUNCTION && - (retval_ptr->var_flags & IS_VAR_RET_REF)) { + (Z_FLAGS_P(retval_ptr) & IS_VAR_RET_REF)) { //??? } else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { } else { zend_error(E_NOTICE, "Only variable references should be returned by reference"); @@ -12772,7 +12772,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_VAR_HANDLER(ZEND_OPCODE_HAND varptr = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); if ((!(opline->extended_value & ZEND_ARG_SEND_FUNCTION) || - (varptr->var_flags & IS_VAR_RET_REF)) && + (Z_FLAGS_P(varptr) & IS_VAR_RET_REF)) && ((!Z_REFCOUNTED_P(varptr) && Z_TYPE_P(varptr) != IS_STRING) || Z_ISREF_P(varptr) || Z_TYPE_P(varptr) == IS_OBJECT || @@ -13027,7 +13027,7 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HAND inc_filename = _get_zval_ptr_var(opline->op1.var, execute_data, &free_op1 TSRMLS_CC); ZVAL_UNDEF(&tmp_inc_filename); - if (inc_filename->type!=IS_STRING) { + if (Z_TYPE_P(inc_filename) != IS_STRING) { ZVAL_DUP(&tmp_inc_filename, inc_filename); convert_to_string(&tmp_inc_filename); inc_filename = &tmp_inc_filename; @@ -15151,7 +15151,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZEND_OPCO if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -15266,7 +15266,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CONST_HANDLER(ZE } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -15966,7 +15966,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_VAR_CONST_HANDLER(ZEND_OPCODE_HANDLER_ * not return by reference we throw a notice. */ if (IS_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -17439,7 +17439,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -17555,7 +17555,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_TMP_HANDLER(ZEND } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -18016,7 +18016,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_VAR_TMP_HANDLER(ZEND_OPCODE_HANDLER_AR * not return by reference we throw a notice. */ if (IS_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -19626,7 +19626,7 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDL value_ptr && !Z_ISREF_P(value_ptr) && opline->extended_value == ZEND_RETURNS_FUNCTION && - !(value_ptr->var_flags & IS_VAR_RET_REF)) { + !(Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) { if (!(free_op2.var != NULL)) { PZVAL_LOCK(value_ptr); /* undo the effect of get_zval_ptr_ptr() */ } @@ -19728,7 +19728,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -19844,7 +19844,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_VAR_HANDLER(ZEND } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -20452,7 +20452,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_VAR_VAR_HANDLER(ZEND_OPCODE_HANDLER_AR * not return by reference we throw a notice. */ if (IS_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -21263,7 +21263,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_UNUSED_HANDLER(Z } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -21579,7 +21579,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_VAR_UNUSED_HANDLER(ZEND_OPCODE_HANDLER * not return by reference we throw a notice. */ if (IS_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -23007,7 +23007,7 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLE value_ptr && !Z_ISREF_P(value_ptr) && opline->extended_value == ZEND_RETURNS_FUNCTION && - !(value_ptr->var_flags & IS_VAR_RET_REF)) { + !(Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) { if (!0) { PZVAL_LOCK(value_ptr); /* undo the effect of get_zval_ptr_ptr() */ } @@ -23108,7 +23108,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_ if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -23223,7 +23223,7 @@ static int ZEND_FASTCALL ZEND_INIT_STATIC_METHOD_CALL_SPEC_VAR_CV_HANDLER(ZEND_ } call->object = Z_OBJ(EG(This)); if (call->object) { - call->object->gc.refcount++; + GC_REFCOUNT(call->object)++; } } @@ -23683,7 +23683,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_VAR_CV_HANDLER(ZEND_OPCODE_HANDLER_ARG * not return by reference we throw a notice. */ if (IS_VAR == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -24683,7 +24683,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CONST_HANDLER(ZEND_O if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -25140,7 +25140,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDL * not return by reference we throw a notice. */ if (IS_UNUSED == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -26064,7 +26064,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_TMP_HANDLER(ZEND_OPC if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -26429,7 +26429,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER * not return by reference we throw a notice. */ if (IS_UNUSED == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -27353,7 +27353,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_VAR_HANDLER(ZEND_OPC if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -27718,7 +27718,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER * not return by reference we throw a notice. */ if (IS_UNUSED == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -28120,7 +28120,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_UNUSED_UNUSED_HANDLER(ZEND_OPCODE_HAND * not return by reference we throw a notice. */ if (IS_UNUSED == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -29042,7 +29042,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_UNUSED_CV_HANDLER(ZEND_OPCO if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -29406,7 +29406,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ * not return by reference we throw a notice. */ if (IS_UNUSED == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -29954,7 +29954,7 @@ static int ZEND_FASTCALL ZEND_RETURN_BY_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER if (IS_CV == IS_VAR && !Z_ISREF_P(retval_ptr)) { if (opline->extended_value == ZEND_RETURNS_FUNCTION && - (retval_ptr->var_flags & IS_VAR_RET_REF)) { + (Z_FLAGS_P(retval_ptr) & IS_VAR_RET_REF)) { //??? } else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { } else { zend_error(E_NOTICE, "Only variable references should be returned by reference"); @@ -30053,7 +30053,7 @@ static int ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL varptr = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC); if ((!(opline->extended_value & ZEND_ARG_SEND_FUNCTION) || - (varptr->var_flags & IS_VAR_RET_REF)) && + (Z_FLAGS_P(varptr) & IS_VAR_RET_REF)) && ((!Z_REFCOUNTED_P(varptr) && Z_TYPE_P(varptr) != IS_STRING) || Z_ISREF_P(varptr) || Z_TYPE_P(varptr) == IS_OBJECT || @@ -30296,7 +30296,7 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL inc_filename = _get_zval_ptr_cv_BP_VAR_R(execute_data, opline->op1.var TSRMLS_CC); ZVAL_UNDEF(&tmp_inc_filename); - if (inc_filename->type!=IS_STRING) { + if (Z_TYPE_P(inc_filename) != IS_STRING) { ZVAL_DUP(&tmp_inc_filename, inc_filename); convert_to_string(&tmp_inc_filename); inc_filename = &tmp_inc_filename; @@ -32271,7 +32271,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CONST_HANDLER(ZEND_OPCOD if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -32874,7 +32874,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CV_CONST_HANDLER(ZEND_OPCODE_HANDLER_A * not return by reference we throw a notice. */ if (IS_CV == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -34338,7 +34338,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_ if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -34796,7 +34796,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CV_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARG * not return by reference we throw a notice. */ if (IS_CV == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -36397,7 +36397,7 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLE value_ptr && !Z_ISREF_P(value_ptr) && opline->extended_value == ZEND_RETURNS_FUNCTION && - !(value_ptr->var_flags & IS_VAR_RET_REF)) { + !(Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) { if (!(free_op2.var != NULL)) { PZVAL_LOCK(value_ptr); /* undo the effect of get_zval_ptr_ptr() */ } @@ -36498,7 +36498,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_ if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -37103,7 +37103,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CV_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARG * not return by reference we throw a notice. */ if (IS_CV == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -38093,7 +38093,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CV_UNUSED_HANDLER(ZEND_OPCODE_HANDLER_ * not return by reference we throw a notice. */ if (IS_CV == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); @@ -39512,7 +39512,7 @@ static int ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER value_ptr && !Z_ISREF_P(value_ptr) && opline->extended_value == ZEND_RETURNS_FUNCTION && - !(value_ptr->var_flags & IS_VAR_RET_REF)) { + !(Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) { if (!0) { PZVAL_LOCK(value_ptr); /* undo the effect of get_zval_ptr_ptr() */ } @@ -39612,7 +39612,7 @@ static int ZEND_FASTCALL ZEND_INIT_METHOD_CALL_SPEC_CV_CV_HANDLER(ZEND_OPCODE_H if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) { call->object = NULL; } else { - call->object->gc.refcount++; /* For $this pointer */ + GC_REFCOUNT(call->object)++; /* For $this pointer */ } call->num_additional_args = 0; @@ -40068,7 +40068,7 @@ static int ZEND_FASTCALL ZEND_YIELD_SPEC_CV_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS * not return by reference we throw a notice. */ if (IS_CV == IS_VAR && !Z_ISREF_P(value_ptr) && !(opline->extended_value == ZEND_RETURNS_FUNCTION - && (value_ptr->var_flags & IS_VAR_RET_REF)) + && (Z_FLAGS_P(value_ptr) & IS_VAR_RET_REF)) //??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) { ) { zend_error(E_NOTICE, "Only variable references should be yielded by reference"); |