com php-src: Fix call graph construction: ext/opcache/Optimizer /zend_call_graph.c
| From: | Nikita Popov | Date: | Sun, 23 Oct 2016 20:12:55 +0000 |
| Subject: | com php-src: Fix call graph construction: ext/opcache/Optimizer /zend_call_graph.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95267@lists.php.net to get a copy of this message | ||
Commit: c3232c590323c424721f5a88d0ea6fa383d70f1d
Author: Nikita Popov <nikic@php.net> Sun, 23 Oct 2016 22:12:55 +0200
Parents: 820bca8ca3e6520d13171cca141e02d5f2b9d27e
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c3232c590323c424721f5a88d0ea6fa383d70f1d
Log:
Fix call graph construction
Travis build for 7.1+ has been failing for the past week...
Changed paths:
M ext/opcache/Optimizer/zend_call_graph.c
Diff:
diff --git a/ext/opcache/Optimizer/zend_call_graph.c b/ext/opcache/Optimizer/zend_call_graph.c
index 0df28eb..297f84b 100644
--- a/ext/opcache/Optimizer/zend_call_graph.c
+++ b/ext/opcache/Optimizer/zend_call_graph.c
@@ -116,6 +116,8 @@ static int zend_analyze_calls(zend_arena **arena, zend_script *script, uint32_t
zend_func_info *callee_func_info = ZEND_FUNC_INFO(&func->op_array);
call_info->next_caller = callee_func_info ? callee_func_info->caller_info : NULL;
}
+ } else {
+ call_info = NULL;
}
call++;
break;