summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-07-13 19:07:11 +0800
committerXinchen Hui <laruence@php.net>2015-07-13 19:07:11 +0800
commit833e4ced87bcdfc99c5bcebf43e0a5b96e87c52a (patch)
tree4e3700ec72636e4922f4de91fe99d96a5a3ff298
parent5384ccf5bbcc7b1d5bbff26b81ac4e7be80c32b5 (diff)
parente27cbe6542eea5ab5ff472ee7e2a5cda3639edaf (diff)
downloadphp-git-833e4ced87bcdfc99c5bcebf43e0a5b96e87c52a.tar.gz
Merge branch 'goto_branch_hint' of https://github.com/bogdanandone/php-src
-rw-r--r--Zend/zend_vm_gen.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 250b2467e0..36c4a32f5c 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1189,7 +1189,7 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name)
// Emit array of labels of opcode handlers and code for
// zend_opcode_handlers initialization
$prolog = $m[1];
- out($f,$prolog."if (execute_data == NULL) {\n");
+ out($f,$prolog."if (UNEXPECTED(execute_data == NULL)) {\n");
out($f,$prolog."\tstatic const void* labels[] = {\n");
gen_labels($f, $spec, $kind, $prolog."\t\t");
out($f,$prolog."\t};\n");