Merge branch 'PHP-8.0'

dstogov · dstogov · commit 9f13c8feb104 · 2020-11-11T18:34:30.000+03:00
* PHP-8.0:
  Remove assertion
diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c
@@ -829,7 +829,8 @@ static int zend_jit_trace_restrict_ssa_var_info(const zend_op_array *op_array, c
 					} else if (instanceof_function(info->ce, tssa->var_info[ssa_var].ce)) {
 						// TODO: TSSA may miss Pi() functions and corresponding instanceof() constraints ???
 					} else {
-						ZEND_UNREACHABLE();
+						// TODO: classes may implement the same interface ???
+						//ZEND_UNREACHABLE();
 					}
 				}
 				tssa->var_info[ssa_var].is_instanceof =

Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,8 @@ static int zend_jit_trace_restrict_ssa_var_info(const zend_op_array *op_array, c`
`829`	`829`	`} else if (instanceof_function(info->ce, tssa->var_info[ssa_var].ce)) {`
`830`	`830`	`// TODO: TSSA may miss Pi() functions and corresponding instanceof() constraints ???`
`831`	`831`	`} else {`
`832`		`- ZEND_UNREACHABLE();`
	`832`	`+ // TODO: classes may implement the same interface ???`
	`833`	`+ //ZEND_UNREACHABLE();`
`833`	`834`	`}`
`834`	`835`	`}`
`835`	`836`	`tssa->var_info[ssa_var].is_instanceof =`