diff --git a/NEWS b/NEWS index 1cb5d000d73..5fbed693e82 100644 --- a/NEWS +++ b/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) diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index b78b05aaea9..66bb380c23d 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/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 */ diff --git a/ext/opcache/tests/jit/gh20890.phpt b/ext/opcache/tests/jit/gh20890.phpt deleted file mode 100644 index c375c379fcc..00000000000 --- a/ext/opcache/tests/jit/gh20890.phpt +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -GH-20890 (Segfault in zval_undefined_cv with non-simple property hook with minimal tracing JIT) ---CREDITS-- -Moonster8282 ---EXTENSIONS-- -opcache ---INI-- -opcache.jit=1251 ---FILE-- -readCount++; - return $this->readCount * 2; - } - } -} - -function hook_hot_path($obj, $iterations) { - $sum = 0; - for ($i = 0; $i < $iterations; $i++) { - $sum += $obj->computed; - } - return $sum; -} - -echo "Testing property hook in hot path...\n"; -$obj = new HookJIT(); -$result = hook_hot_path($obj, 100); -echo "Result: $result\n"; -?> ---EXPECT-- -Testing property hook in hot path... -Result: 10100