Merge branch 'PHP-8.0'

* PHP-8.0:
  Fix handling of sccp exceptions

Author: nikic

ext/opcache/Optimizer/sccp.c

@@ -1046,16 +1046,17 @@ static inline int ct_eval_func_call(
 	for (i = 0; i < num_args; i++) {
 		zval_ptr_dtor_nogc(EX_VAR_NUM(i));
 	}
-	efree(execute_data);
-	EG(current_execute_data) = prev_execute_data;
 
+	int retval = SUCCESS;
 	if (EG(exception)) {
 		zval_ptr_dtor(result);
 		zend_clear_exception();
-		return FAILURE;
+		retval = FAILURE;
 	}
 
-	return SUCCESS;
+	efree(execute_data);
+	EG(current_execute_data) = prev_execute_data;
+	return retval;
 }
 
 #define SET_RESULT(op, zv) do { \

ext/opcache/tests/opt/sccp_exception2.inc

@@ -0,0 +1,2 @@
+<?php
+var_dump(version_compare('1.2', '2.1', '??'));

ext/opcache/tests/opt/sccp_exception2.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Exception thrown during SCCP evaluation, separate file variation
+--FILE--
+<?php
+require __DIR__ . '/sccp_exception2.inc';
+?>
+--EXPECTF--
+Fatal error: Uncaught ValueError: version_compare(): Argument #3 ($operator) must be a valid comparison operator in %s:%d
+Stack trace:
+#0 %s(%d): version_compare('1.2', '2.1', '??')
+#1 %s(%d): require('/home/nikic/php...')
+#2 {main}
+  thrown in %s on line %d