diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-19 10:09:06 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-19 10:09:06 +0100 |
| commit | 32c0cbcbc146deebf5cd3dc35fad630e2ba5bdeb (patch) | |
| tree | 58e0775bbea6b9922170a4b65e79e0f5546b67a4 /Zend/zend_compile.c | |
| parent | 12ffee57d6adf38f8dd8b39ea7f7a5e4c462d358 (diff) | |
| parent | f8cd8eb7404e4605bf2f9f0471f7ff4784e5341e (diff) | |
| download | php-git-32c0cbcbc146deebf5cd3dc35fad630e2ba5bdeb.tar.gz | |
Merge remote-tracking branch 'php-src/PHP-7.4' into PHP-7.4
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index bdc5b3170a..c5d4fd737f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1432,11 +1432,11 @@ static void zend_add_to_list(void *result, void *item) /* {{{ */ } /* }}} */ -void zend_do_extended_info(void) /* {{{ */ +void zend_do_extended_stmt(void) /* {{{ */ { zend_op *opline; - if (!(CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO)) { + if (!(CG(compiler_options) & ZEND_COMPILE_EXTENDED_STMT)) { return; } @@ -1450,7 +1450,7 @@ void zend_do_extended_fcall_begin(void) /* {{{ */ { zend_op *opline; - if (!(CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO)) { + if (!(CG(compiler_options) & ZEND_COMPILE_EXTENDED_FCALL)) { return; } @@ -1464,7 +1464,7 @@ void zend_do_extended_fcall_end(void) /* {{{ */ { zend_op *opline; - if (!(CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO)) { + if (!(CG(compiler_options) & ZEND_COMPILE_EXTENDED_FCALL)) { return; } @@ -4560,7 +4560,7 @@ void zend_compile_for(zend_ast *ast) /* {{{ */ zend_update_jump_target_to_next(opnum_jmp); zend_compile_expr_list(&result, cond_ast); - zend_do_extended_info(); + zend_do_extended_stmt(); zend_emit_cond_jump(ZEND_JMPNZ, &result, opnum_start); @@ -5834,7 +5834,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast, zend_bool toplevel) /* zend_oparray_context_begin(&orig_oparray_context); - if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) { + if (CG(compiler_options) & ZEND_COMPILE_EXTENDED_STMT) { zend_op *opline_ext = zend_emit_op(NULL, ZEND_EXT_NOP, NULL, NULL); opline_ext->lineno = decl->start_lineno; } @@ -5865,7 +5865,7 @@ void zend_compile_func_decl(znode *result, zend_ast *ast, zend_bool toplevel) /* /* put the implicit return on the really last line */ CG(zend_lineno) = decl->end_lineno; - zend_do_extended_info(); + zend_do_extended_stmt(); zend_emit_final_return(0); pass_two(CG(active_op_array)); @@ -8163,8 +8163,8 @@ void zend_compile_stmt(zend_ast *ast) /* {{{ */ CG(zend_lineno) = ast->lineno; - if ((CG(compiler_options) & ZEND_COMPILE_EXTENDED_INFO) && !zend_is_unticked_stmt(ast)) { - zend_do_extended_info(); + if ((CG(compiler_options) & ZEND_COMPILE_EXTENDED_STMT) && !zend_is_unticked_stmt(ast)) { + zend_do_extended_stmt(); } switch (ast->kind) { |