diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-01-20 10:52:57 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-01-20 10:52:57 +0000 |
| commit | 98164714eacf22a56ecd3a991bea22a486f0bcc8 (patch) | |
| tree | 25bc2bce642515ea7824e9683d900f4b35d1d736 /Zend/zend_opcode.c | |
| parent | b899656eb0bd3d56caf8adebeef0ab3b2421e413 (diff) | |
| parent | 4b972373745ed43d9a4762cff6c59600fb4f8c52 (diff) | |
| download | php-git-98164714eacf22a56ecd3a991bea22a486f0bcc8.tar.gz | |
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 8abfd7a56c..dee54ba14c 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | Zend Engine | +----------------------------------------------------------------------+ - | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is | @@ -399,9 +399,8 @@ ZEND_API void destroy_op_array(zend_op_array *op_array) } } if (op_array->arg_info) { - int32_t num_args = op_array->num_args; + uint32_t num_args = op_array->num_args; zend_arg_info *arg_info = op_array->arg_info; - int32_t i; if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) { arg_info--; @@ -586,7 +585,7 @@ ZEND_API int pass_two(zend_op_array *op_array) zend_update_extended_info(op_array); } if (CG(compiler_options) & ZEND_COMPILE_HANDLE_OP_ARRAY) { - if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_PERSIST) { + if (zend_extension_flags & ZEND_EXTENSIONS_HAVE_OP_ARRAY_HANDLER) { zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_handler, op_array); } } |