Fixed bug #80968 (JIT segfault with return from required file)

dstogov · dstogov · commit 6e2d47e071f5 · 2021-05-20T16:45:24.000+03:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2021, PHP 8.0.8
 
+- Opcache:
+  . Fixed bug #80968 (JIT segfault with return from required file). (Dmitry)
+
 - Standard:
   . Fixed bug #81048 (phpinfo(INFO_VARIABLES) "Array to string conversion").
     (cmb)
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -15290,8 +15290,9 @@ static zend_bool zend_jit_opline_supports_reg(const zend_op_array *op_array, zen
 		case ZEND_IS_IDENTICAL:
 		case ZEND_IS_NOT_IDENTICAL:
 		case ZEND_CASE:
-		case ZEND_RETURN:
 			return 1;
+		case ZEND_RETURN:
+			return (op_array->type != ZEND_EVAL_CODE && op_array->function_name);
 		case ZEND_ASSIGN:
 			op1_info = OP1_INFO();
 			op2_info = OP2_INFO();
