Skip to content

Commit 32c0245

Browse files
committed
Revert "Fix GH-20890: Segfault in zval_undefined_cv with non-simple property hook with minimal tracing JIT"
This reverts commit 57c62eb.
1 parent 57c62eb commit 32c0245

File tree

3 files changed

+0
-49
lines changed

3 files changed

+0
-49
lines changed

NEWS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ PHP NEWS
2525
. Fixed bug GH-20836 (Stack overflow in mb_convert_variables with
2626
recursive array references). (alexandre-daubois)
2727

28-
- Opcache:
29-
. Fixed bug GH-20890 (Segfault in zval_undefined_cv with non-simple
30-
property hook with minimal tracing JIT). (ndossche)
31-
3228
- Phar:
3329
. Fixed bug GH-20882 (buildFromIterator breaks with missing base directory).
3430
(ndossche)

ext/opcache/jit/zend_jit_trace.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,14 +328,6 @@ static int zend_jit_trace_may_exit(const zend_op_array *op_array, const zend_op
328328
// TODO: recompilation may change target ???
329329
return 0;
330330
#endif
331-
case ZEND_FETCH_OBJ_R:
332-
if (opline->op2_type == IS_CONST) {
333-
const zend_class_entry *ce = opline->op1_type == IS_UNUSED ? op_array->scope : NULL;
334-
if (!ce || !(ce->ce_flags & ZEND_ACC_FINAL) || ce->num_hooked_props > 0) {
335-
return 1;
336-
}
337-
}
338-
break;
339331
case ZEND_RETURN_BY_REF:
340332
case ZEND_RETURN:
341333
/* return */

ext/opcache/tests/jit/gh20890.phpt

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

0 commit comments

Comments
 (0)