Add NEWS

3 files changed, 14 insertions, 10 deletions

diff --git a/NEWS b/NEWS
index e68c7fb368..8a8694bf04 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2017 PHP 7.0.19
 
+- Core:
+  . Fixed bug #74188 (Null coalescing operator fails for undeclared static
+    class properties). (tpunt)
+
 - GD:
   . Fixed bug #74343 (compile fails on solaris 11 with system gd2 library).
     (krakjoe)
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index a5ff72b668..b2f9bbdf50 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1563,7 +1563,7 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMPVAR|CV, UNUSED|CONST|V
 			FREE_OP1();
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if (OP1_TYPE == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 7f2996387c..1fd6603713 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5055,7 +5055,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if (IS_CONST == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
@@ -7023,7 +7023,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if (IS_CONST == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
@@ -7541,7 +7541,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if (IS_CONST == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
@@ -31473,7 +31473,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if (IS_CV == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
@@ -33713,7 +33713,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if (IS_CV == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
@@ -34673,7 +34673,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if (IS_CV == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
@@ -41946,7 +41946,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 			zval_ptr_dtor_nogc(free_op1);
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
@@ -42961,7 +42961,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 			zval_ptr_dtor_nogc(free_op1);
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}
@@ -43384,7 +43384,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_
 			zval_ptr_dtor_nogc(free_op1);
 			HANDLE_EXCEPTION();
 		}
-		if (retval) {
+		if (EXPECTED(retval)) {
 			if ((IS_TMP_VAR|IS_VAR) == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);
 			}