diff --git a/NEWS b/NEWS index 19a6e7045c7b6..df968d86ccb45 100644 --- a/NEWS +++ b/NEWS @@ -34,6 +34,10 @@ PHP NEWS . Fixed bug GH-15432 (Heap corruption when querying a vector). (cmb, Kamil Tekiela) +- Opcache: + . Fixed bug GH-15490 (Building of callgraph modifies preloaded symbols). + (ilutov) + - PDO_MYSQL: . mysqlnd: support ER_CLIENT_INTERACTION_TIMEOUT. (Appla) diff --git a/Zend/Optimizer/zend_call_graph.c b/Zend/Optimizer/zend_call_graph.c index abd5dac533137..8a2f8ea2a7e1a 100644 --- a/Zend/Optimizer/zend_call_graph.c +++ b/Zend/Optimizer/zend_call_graph.c @@ -79,7 +79,8 @@ ZEND_API void zend_analyze_calls(zend_arena **arena, zend_script *script, uint32 if (build_flags & ZEND_CALL_TREE) { call_info->next_caller = NULL; - } else if (func->type == ZEND_INTERNAL_FUNCTION) { + } else if (func->type == ZEND_INTERNAL_FUNCTION + || func->op_array.filename != script->filename) { call_info->next_caller = NULL; } else { zend_func_info *callee_func_info = ZEND_FUNC_INFO(&func->op_array); diff --git a/ext/opcache/tests/jit/gh15490.inc b/ext/opcache/tests/jit/gh15490.inc new file mode 100644 index 0000000000000..e702a9e244028 --- /dev/null +++ b/ext/opcache/tests/jit/gh15490.inc @@ -0,0 +1,9 @@ + +--FILE-- + +--EXPECT-- +Hello world!