summaryrefslogtreecommitdiff
path: root/Zend/zend_opcode.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-02-19 10:09:06 +0100
committerNikita Popov <nikita.ppv@gmail.com>2019-02-19 10:09:06 +0100
commit32c0cbcbc146deebf5cd3dc35fad630e2ba5bdeb (patch)
tree58e0775bbea6b9922170a4b65e79e0f5546b67a4 /Zend/zend_opcode.c
parent12ffee57d6adf38f8dd8b39ea7f7a5e4c462d358 (diff)
parentf8cd8eb7404e4605bf2f9f0471f7ff4784e5341e (diff)
downloadphp-git-32c0cbcbc146deebf5cd3dc35fad630e2ba5bdeb.tar.gz
Merge remote-tracking branch 'php-src/PHP-7.4' into PHP-7.4
Diffstat (limited to 'Zend/zend_opcode.c')
-rw-r--r--Zend/zend_opcode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 1093909c83..5b1914c99d 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -478,7 +478,7 @@ ZEND_API void destroy_op_array(zend_op_array *op_array)
}
}
-static void zend_update_extended_info(zend_op_array *op_array)
+static void zend_update_extended_stmts(zend_op_array *op_array)
{
zend_op *opline = op_array->opcodes, *end=opline+op_array->last;
@@ -839,8 +839,8 @@ ZEND_API int pass_two(zend_op_array *op_array)
if (!ZEND_USER_CODE(op_array->type)) {
return 0;
}
- if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) {
- zend_update_extended_info(op_array);
+ if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_STMT) {
+ zend_update_extended_stmts(op_array);
}
if (CG(compiler_options) & ZEND_COMPILE_HANDLE_OP_ARRAY) {
if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_HANDLER) {