MFH (def.h rev:1.121, execute.h rev:1.120)

Silence FETCH_OBJ_IS / undefined notices

2 files changed, 39 insertions, 13 deletions

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 60851b418a..ed2e2f59a7 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1158,7 +1158,9 @@ ZEND_VM_HELPER_EX(zend_fetch_property_address_read_helper, VAR|UNUSED|CV, CONST|
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index be4a32c838..2417f69a76 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -8674,7 +8674,9 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_CONST(int type, ZEND
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -10098,7 +10100,9 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_TMP(int type, ZEND_O
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -11525,7 +11529,9 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_VAR(int type, ZEND_O
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -13397,7 +13403,9 @@ static int zend_fetch_property_address_read_helper_SPEC_VAR_CV(int type, ZEND_OP
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -14592,7 +14600,9 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CONST(int type, Z
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -15669,7 +15679,9 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_TMP(int type, ZEN
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -16707,7 +16719,9 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_VAR(int type, ZEN
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -18110,7 +18124,9 @@ static int zend_fetch_property_address_read_helper_SPEC_UNUSED_CV(int type, ZEND
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -20644,7 +20660,9 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CONST(int type, ZEND_
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -22060,7 +22078,9 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_TMP(int type, ZEND_OP
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -23479,7 +23499,9 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_VAR(int type, ZEND_OP
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);
@@ -25341,7 +25363,9 @@ static int zend_fetch_property_address_read_helper_SPEC_CV_CV(int type, ZEND_OPC
 
 
 	if (container->type != IS_OBJECT || !Z_OBJ_HT_P(container)->read_property) {
-		zend_error(E_NOTICE, "Trying to get property of non-object");
+		if (type != BP_VAR_IS) {
+			zend_error(E_NOTICE, "Trying to get property of non-object");
+		}
 		*retval = EG(uninitialized_zval_ptr);
 		SELECTIVE_PZVAL_LOCK(*retval, &opline->result);
 		AI_USE_PTR(EX_T(opline->result.u.var).var);