Address review comments

Author: Girgias

Zend/tests/in-de-crement/incdec_undefined_vars_exception.phpt

@@ -12,37 +12,37 @@ try {
     $x++;
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
-    if (!isset($x)) { echo("UNDEF\n"); } else { var_dump($x); }
+    if (!isset($x) && !@is_null($x)) { echo("UNDEF\n"); } else { var_dump($x); }
 }
 unset($x);
 try {
     $x--;
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
-    if (!isset($x)) { echo("UNDEF\n"); } else { var_dump($x); }
+    if (!isset($x) && !@is_null($x)) { echo("UNDEF\n"); } else { var_dump($x); }
 }
 unset($x);
 try {
     ++$x;
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
-    if (!isset($x)) { echo("UNDEF\n"); } else { var_dump($x); }
+    if (!isset($x) && !@is_null($x)) { echo("UNDEF\n"); } else { var_dump($x); }
 }
 unset($x);
 try {
     --$x;
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
-    if (!isset($x)) { echo("UNDEF\n"); } else { var_dump($x); }
+    if (!isset($x) && !@is_null($x)) { echo("UNDEF\n"); } else { var_dump($x); }
 }
 unset($x);
 ?>
 --EXPECT--
 Undefined variable $x
-UNDEF
+NULL
 Undefined variable $x
-UNDEF
+NULL
 Undefined variable $x
-UNDEF
+NULL
 Undefined variable $x
-UNDEF
+NULL

Zend/tests/in-de-crement/incdec_undefined_vars_exception_use_result_op.phpt

@@ -12,37 +12,37 @@ try {
     $y = $x++;
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
-    if (!isset($x)) { echo("UNDEF\n"); } else { var_dump($x); }
+    if (!isset($x) && !@is_null($x)) { echo("UNDEF\n"); } else { var_dump($x); }
 }
 unset($x);
 try {
     $y = $x--;
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
-    if (!isset($x)) { echo("UNDEF\n"); } else { var_dump($x); }
+    if (!isset($x) && !@is_null($x)) { echo("UNDEF\n"); } else { var_dump($x); }
 }
 unset($x);
 try {
     $y = ++$x;
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
-    if (!isset($x)) { echo("UNDEF\n"); } else { var_dump($x); }
+    if (!isset($x) && !@is_null($x)) { echo("UNDEF\n"); } else { var_dump($x); }
 }
 unset($x);
 try {
     $y = --$x;
 } catch (\Exception $e) {
     echo $e->getMessage(), PHP_EOL;
-    if (!isset($x)) { echo("UNDEF\n"); } else { var_dump($x); }
+    if (!isset($x) && !@is_null($x)) { echo("UNDEF\n"); } else { var_dump($x); }
 }
 unset($x);
 ?>
 --EXPECT--
 Undefined variable $x
-UNDEF
+NULL
 Undefined variable $x
-UNDEF
+NULL
 Undefined variable $x
-UNDEF
+NULL
 Undefined variable $x
-UNDEF
+NULL

Zend/zend_vm_def.h

@@ -1488,7 +1488,7 @@ ZEND_VM_HELPER(zend_pre_inc_helper, VAR|CV, ANY)
 	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_UNDEF)) {
 		ZVAL_UNDEFINED_OP1();
 		if (UNEXPECTED(EG(exception))) {
-			/* Smart branch expects result to be set with exceptions */
+			/* opcodes are expected to set the result value */
 			if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 				ZVAL_NULL(EX_VAR(opline->result.var));
 			}
@@ -1553,7 +1553,7 @@ ZEND_VM_HELPER(zend_pre_dec_helper, VAR|CV, ANY)
 	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_UNDEF)) {
 		ZVAL_UNDEFINED_OP1();
 		if (UNEXPECTED(EG(exception))) {
-			/* Smart branch expects result to be set with exceptions */
+			/* opcodes are expected to set the result value */
 			if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 				ZVAL_NULL(EX_VAR(opline->result.var));
 			}
@@ -1619,7 +1619,7 @@ ZEND_VM_HELPER(zend_post_inc_helper, VAR|CV, ANY)
 	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_UNDEF)) {
 		ZVAL_UNDEFINED_OP1();
 		if (UNEXPECTED(EG(exception))) {
-			/* Smart branch expects result to be set with exceptions */
+			/* opcodes are expected to set the result value */
 			if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 				ZVAL_NULL(EX_VAR(opline->result.var));
 			}
@@ -1677,7 +1677,7 @@ ZEND_VM_HELPER(zend_post_dec_helper, VAR|CV, ANY)
 	if (OP1_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_UNDEF)) {
 		ZVAL_UNDEFINED_OP1();
 		if (UNEXPECTED(EG(exception))) {
-			/* Smart branch expects result to be set with exceptions */
+			/* opcodes are expected to set the result value */
 			if (UNEXPECTED(RETURN_VALUE_USED(opline))) {
 				ZVAL_NULL(EX_VAR(opline->result.var));
 			}