Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Revert "Fix GH-20890: Segfault in zval_undefined_cv with non-simple property hook with minimal tracing JIT"

Author: ndossche

NEWS

@@ -31,10 +31,6 @@ PHP                                                                        NEWS
   . Fixed bug GH-20836 (Stack overflow in mb_convert_variables with
     recursive array references). (alexandre-daubois)
 
-- Opcache:
-  . Fixed bug GH-20890 (Segfault in zval_undefined_cv with non-simple
-    property hook with minimal tracing JIT). (ndossche)
-
 - Phar:
   . Fixed bug GH-20882 (buildFromIterator breaks with missing base directory).
     (ndossche)

ext/opcache/jit/zend_jit_trace.c

@@ -330,14 +330,6 @@ static int zend_jit_trace_may_exit(const zend_op_array *op_array, const zend_op
 			// TODO: recompilation may change target ???
 			return 0;
 #endif
-		case ZEND_FETCH_OBJ_R:
-			if (opline->op2_type == IS_CONST) {
-				const zend_class_entry *ce = opline->op1_type == IS_UNUSED ? op_array->scope : NULL;
-				if (!ce || !(ce->ce_flags & ZEND_ACC_FINAL) || ce->num_hooked_props > 0) {
-					return 1;
-				}
-			}
-			break;
 		case ZEND_RETURN_BY_REF:
 		case ZEND_RETURN:
 			/* return */