Add NEWS

nikic · nikic · commit 75b83ec2fd10 · 2017-04-09T15:52:37.000+02:00
diff --git 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
@@ -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
@@ -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);
 			}

Original file line number	Diff line number	Diff line change
`@@ -1563,7 +1563,7 @@ ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST\|TMPVAR\|CV, UNUSED\|CONST\|V`
`1563`	`1563`	`FREE_OP1();`
`1564`	`1564`	`HANDLE_EXCEPTION();`
`1565`	`1565`	`}`
`1566`		`- if (retval) {`
	`1566`	`+ if (EXPECTED(retval)) {`
`1567`	`1567`	`if (OP1_TYPE == IS_CONST) {`
`1568`	`1568`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`1569`	`1569`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5055,7 +5055,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`5055`	`5055`
`5056`	`5056`	`HANDLE_EXCEPTION();`
`5057`	`5057`	`}`
`5058`		`- if (retval) {`
	`5058`	`+ if (EXPECTED(retval)) {`
`5059`	`5059`	`if (IS_CONST == IS_CONST) {`
`5060`	`5060`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`5061`	`5061`	`}`
`@@ -7023,7 +7023,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`7023`	`7023`
`7024`	`7024`	`HANDLE_EXCEPTION();`
`7025`	`7025`	`}`
`7026`		`- if (retval) {`
	`7026`	`+ if (EXPECTED(retval)) {`
`7027`	`7027`	`if (IS_CONST == IS_CONST) {`
`7028`	`7028`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`7029`	`7029`	`}`
`@@ -7541,7 +7541,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`7541`	`7541`
`7542`	`7542`	`HANDLE_EXCEPTION();`
`7543`	`7543`	`}`
`7544`		`- if (retval) {`
	`7544`	`+ if (EXPECTED(retval)) {`
`7545`	`7545`	`if (IS_CONST == IS_CONST) {`
`7546`	`7546`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`7547`	`7547`	`}`
`@@ -31473,7 +31473,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`31473`	`31473`
`31474`	`31474`	`HANDLE_EXCEPTION();`
`31475`	`31475`	`}`
`31476`		`- if (retval) {`
	`31476`	`+ if (EXPECTED(retval)) {`
`31477`	`31477`	`if (IS_CV == IS_CONST) {`
`31478`	`31478`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`31479`	`31479`	`}`
`@@ -33713,7 +33713,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`33713`	`33713`
`33714`	`33714`	`HANDLE_EXCEPTION();`
`33715`	`33715`	`}`
`33716`		`- if (retval) {`
	`33716`	`+ if (EXPECTED(retval)) {`
`33717`	`33717`	`if (IS_CV == IS_CONST) {`
`33718`	`33718`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`33719`	`33719`	`}`
`@@ -34673,7 +34673,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`34673`	`34673`
`34674`	`34674`	`HANDLE_EXCEPTION();`
`34675`	`34675`	`}`
`34676`		`- if (retval) {`
	`34676`	`+ if (EXPECTED(retval)) {`
`34677`	`34677`	`if (IS_CV == IS_CONST) {`
`34678`	`34678`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`34679`	`34679`	`}`
`@@ -41946,7 +41946,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`41946`	`41946`	`zval_ptr_dtor_nogc(free_op1);`
`41947`	`41947`	`HANDLE_EXCEPTION();`
`41948`	`41948`	`}`
`41949`		`- if (retval) {`
	`41949`	`+ if (EXPECTED(retval)) {`
`41950`	`41950`	`if ((IS_TMP_VAR\|IS_VAR) == IS_CONST) {`
`41951`	`41951`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`41952`	`41952`	`}`
`@@ -42961,7 +42961,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`42961`	`42961`	`zval_ptr_dtor_nogc(free_op1);`
`42962`	`42962`	`HANDLE_EXCEPTION();`
`42963`	`42963`	`}`
`42964`		`- if (retval) {`
	`42964`	`+ if (EXPECTED(retval)) {`
`42965`	`42965`	`if ((IS_TMP_VAR\|IS_VAR) == IS_CONST) {`
`42966`	`42966`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`42967`	`42967`	`}`
`@@ -43384,7 +43384,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_fetch_var_address_helper_SPEC_`
`43384`	`43384`	`zval_ptr_dtor_nogc(free_op1);`
`43385`	`43385`	`HANDLE_EXCEPTION();`
`43386`	`43386`	`}`
`43387`		`- if (retval) {`
	`43387`	`+ if (EXPECTED(retval)) {`
`43388`	`43388`	`if ((IS_TMP_VAR\|IS_VAR) == IS_CONST) {`
`43389`	`43389`	`CACHE_POLYMORPHIC_PTR(Z_CACHE_SLOT_P(EX_CONSTANT(opline->op1)), ce, retval);`
`43390`	`43390`	`}`