Skip to content

Commit 9731f11

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: Revert "Fix GH-20890: Segfault in zval_undefined_cv with non-simple property hook with minimal tracing JIT"
2 parents c8952c7 + fd5e451 commit 9731f11

File tree

2 files changed

+0
-45
lines changed

2 files changed

+0
-45
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,14 +345,6 @@ static int zend_jit_trace_may_exit(const zend_op_array *op_array, const zend_op
345345
// TODO: recompilation may change target ???
346346
return 0;
347347
#endif
348-
case ZEND_FETCH_OBJ_R:
349-
if (opline->op2_type == IS_CONST) {
350-
const zend_class_entry *ce = opline->op1_type == IS_UNUSED ? op_array->scope : NULL;
351-
if (!ce || !(ce->ce_flags & ZEND_ACC_FINAL) || ce->num_hooked_props > 0) {
352-
return 1;
353-
}
354-
}
355-
break;
356348
case ZEND_RETURN_BY_REF:
357349
case ZEND_RETURN:
358350
/* return */

ext/opcache/tests/jit/gh20890.phpt

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)