From: Nikita Popov <nikic@php.net>
Date: Sun, 23 Oct 2016 20:12:55 +0000 (+0200)
Subject: Fix call graph construction
X-Git-Tag: php-7.1.0RC5~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3232c590323c424721f5a88d0ea6fa383d70f1d;p=php

Fix call graph construction

Travis build for 7.1+ has been failing for the past week...
---

diff --git a/ext/opcache/Optimizer/zend_call_graph.c b/ext/opcache/Optimizer/zend_call_graph.c
index 0df28eb02c..297f84b7d6 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;