Skip to content

Commit 1f15400

Browse files
committed
Revert VM changes after related bugfix
1 parent 9bde722 commit 1f15400

File tree

3 files changed

+0
-175
lines changed

3 files changed

+0
-175
lines changed

Zend/zend_vm_def.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,11 +1059,6 @@ ZEND_VM_C_LABEL(assign_op_object):
10591059
zval *orig_zptr = zptr;
10601060
zend_reference *ref;
10611061

1062-
/* This case can ***ONLY*** happen if get_property_ptr_ptr emits a diagnostic
1063-
* (e.g. undefined property warning) and the property is unset in the error handler */
1064-
if (UNEXPECTED(Z_TYPE_P(zptr) == IS_UNDEF)) {
1065-
ZVAL_NULL(zptr);
1066-
}
10671062
do {
10681063
if (UNEXPECTED(Z_ISREF_P(zptr))) {
10691064
ref = Z_REF_P(zptr);
@@ -1333,11 +1328,6 @@ ZEND_VM_C_LABEL(pre_incdec_object):
13331328
ZVAL_NULL(EX_VAR(opline->result.var));
13341329
}
13351330
} else {
1336-
/* This case can ***ONLY*** happen if get_property_ptr_ptr emits a diagnostic
1337-
* (e.g. undefined property warning) and the propery is unset in the error handler */
1338-
if (UNEXPECTED(Z_TYPE_P(zptr) == IS_UNDEF)) {
1339-
ZVAL_NULL(zptr);
1340-
}
13411331
if (OP2_TYPE == IS_CONST) {
13421332
prop_info = (zend_property_info *) CACHED_PTR_EX(cache_slot + 2);
13431333
} else {
@@ -1409,11 +1399,6 @@ ZEND_VM_C_LABEL(post_incdec_object):
14091399
if (UNEXPECTED(Z_ISERROR_P(zptr))) {
14101400
ZVAL_NULL(EX_VAR(opline->result.var));
14111401
} else {
1412-
/* This case can ***ONLY*** happen if get_property_ptr_ptr emits a diagnostic
1413-
* (e.g. undefined property warning) and the property is unset in the error handler */
1414-
if (UNEXPECTED(Z_TYPE_P(zptr) == IS_UNDEF)) {
1415-
ZVAL_NULL(zptr);
1416-
}
14171402
if (OP2_TYPE == IS_CONST) {
14181403
prop_info = (zend_property_info*)CACHED_PTR_EX(cache_slot + 2);
14191404
} else {

Zend/zend_vm_execute.h

Lines changed: 0 additions & 135 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)