diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index a49ee0a50be..3f8b3d5bb28 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -374,17 +374,6 @@ static zend_always_inline zval *_get_zval_ptr_cv_BP_VAR_UNSET(uint32_t var EXECU return ret; } -static zend_always_inline zval *_get_zval_ptr_cv_deref_BP_VAR_UNSET(uint32_t var EXECUTE_DATA_DC) -{ - zval *ret = EX_VAR(var); - - if (UNEXPECTED(Z_TYPE_P(ret) == IS_UNDEF)) { - return zval_undefined_cv(var EXECUTE_DATA_CC); - } - ZVAL_DEREF(ret); - return ret; -} - static zend_always_inline zval *_get_zval_ptr_cv_BP_VAR_IS(uint32_t var EXECUTE_DATA_DC) { zval *ret = EX_VAR(var); @@ -392,14 +381,6 @@ static zend_always_inline zval *_get_zval_ptr_cv_BP_VAR_IS(uint32_t var EXECUTE_ return ret; } -static zend_always_inline zval *_get_zval_ptr_cv_deref_BP_VAR_IS(uint32_t var EXECUTE_DATA_DC) -{ - zval *ret = EX_VAR(var); - - ZVAL_DEREF(ret); - return ret; -} - static zend_always_inline zval *_get_zval_ptr_cv_BP_VAR_RW(uint32_t var EXECUTE_DATA_DC) { zval *ret = EX_VAR(var); @@ -412,19 +393,6 @@ static zend_always_inline zval *_get_zval_ptr_cv_BP_VAR_RW(uint32_t var EXECUTE_ return ret; } -static zend_always_inline zval *_get_zval_ptr_cv_deref_BP_VAR_RW(uint32_t var EXECUTE_DATA_DC) -{ - zval *ret = EX_VAR(var); - - if (UNEXPECTED(Z_TYPE_P(ret) == IS_UNDEF)) { - ZVAL_NULL(ret); - zval_undefined_cv(var EXECUTE_DATA_CC); - return ret; - } - ZVAL_DEREF(ret); - return ret; -} - static zend_always_inline zval *_get_zval_ptr_cv_BP_VAR_W(uint32_t var EXECUTE_DATA_DC) { zval *ret = EX_VAR(var); @@ -435,18 +403,6 @@ static zend_always_inline zval *_get_zval_ptr_cv_BP_VAR_W(uint32_t var EXECUTE_D return ret; } -static zend_always_inline zval *_get_zval_ptr_cv_deref_BP_VAR_W(uint32_t var EXECUTE_DATA_DC) -{ - zval *ret = EX_VAR(var); - - if (Z_TYPE_P(ret) == IS_UNDEF) { - ZVAL_NULL(ret); - return ret; - } - ZVAL_DEREF(ret); - return ret; -} - static zend_always_inline zval *_get_zval_ptr(int op_type, znode_op node, zend_free_op *should_free, int type EXECUTE_DATA_DC OPLINE_DC) { if (op_type & (IS_TMP_VAR|IS_VAR)) {