summaryrefslogtreecommitdiff
path: root/Zend/zend_operators.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2016-09-04 12:36:16 +0200
committerNikita Popov <nikic@php.net>2016-09-04 12:36:16 +0200
commitbbdff7ea24d97cdc198b413165a5218213b6c22d (patch)
treea67c07c92b0c16b1f4dea965135b059c2a0ca3fc /Zend/zend_operators.c
parentbbe0cca221d43499063f332c9377c435747fb807 (diff)
downloadphp-git-bbdff7ea24d97cdc198b413165a5218213b6c22d.tar.gz
Sync convert_to_null with VM cast behavior
Do not call cast_object, this is useless and we haven't been doing it in the VM as of 7.0.
Diffstat (limited to 'Zend/zend_operators.c')
-rw-r--r--Zend/zend_operators.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 4159e43e53..9a90250934 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -411,19 +411,6 @@ try_again:
ZEND_API void ZEND_FASTCALL convert_to_null(zval *op) /* {{{ */
{
- if (Z_TYPE_P(op) == IS_OBJECT) {
- if (Z_OBJ_HT_P(op)->cast_object) {
- zval org;
-
- ZVAL_COPY_VALUE(&org, op);
- if (Z_OBJ_HT_P(op)->cast_object(&org, op, IS_NULL) == SUCCESS) {
- zval_dtor(&org);
- return;
- }
- ZVAL_COPY_VALUE(op, &org);
- }
- }
-
zval_ptr_dtor(op);
ZVAL_NULL(op);
}