Merge branch 'PHP-8.0' into PHP-8.1

nikic · nikic · commit a2fc14c14ff1 · 2021-09-14T10:10:51.000+02:00
* PHP-8.0:
  Fix BIND_STATIC may_throw check
diff --git a/Zend/Optimizer/zend_inference.c b/Zend/Optimizer/zend_inference.c
@@ -4771,7 +4771,7 @@ ZEND_API int zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op,
 				/* Destructor may throw. */
 				return 1;
 			} else {
-				zval *value = (zval*)((char*)op_array->static_variables + (opline->extended_value & ~(ZEND_BIND_REF|ZEND_BIND_IMPLICIT|ZEND_BIND_EXPLICIT)));
+				zval *value = (zval*)((char*)op_array->static_variables->arData + (opline->extended_value & ~(ZEND_BIND_REF|ZEND_BIND_IMPLICIT|ZEND_BIND_EXPLICIT)));
 				/* May throw if initializer is CONSTANT_AST. */
 				return Z_TYPE_P(value) == IS_CONSTANT_AST;
 			}

Original file line number	Diff line number	Diff line change
`@@ -4771,7 +4771,7 @@ ZEND_API int zend_may_throw_ex(const zend_op opline, const zend_ssa_op ssa_op,`
`4771`	`4771`	`/* Destructor may throw. */`
`4772`	`4772`	`return 1;`
`4773`	`4773`	`} else {`
`4774`		`- zval value = (zval)((char*)op_array->static_variables + (opline->extended_value & ~(ZEND_BIND_REF\|ZEND_BIND_IMPLICIT\|ZEND_BIND_EXPLICIT)));`
	`4774`	`+ zval value = (zval)((char*)op_array->static_variables->arData + (opline->extended_value & ~(ZEND_BIND_REF\|ZEND_BIND_IMPLICIT\|ZEND_BIND_EXPLICIT)));`
`4775`	`4775`	`/* May throw if initializer is CONSTANT_AST. */`
`4776`	`4776`	`return Z_TYPE_P(value) == IS_CONSTANT_AST;`
`4777`	`4777`	`}`