Commit: 56baf17a17d102108a4f66f2b4ccafcd7db5468b Author: Dmitry Stogov <dmi...@zend.com> Mon, 25 Feb 2013 14:55:27 +0400 Parents: cf102333a2d150d029ddea8fb6bf4939d075ee91 3da5b830c2233da590ae2ccd0ab4d82e37009c7c Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=56baf17a17d102108a4f66f2b4ccafcd7db5468b Log: Merge branch 'master' of https://github.com/laruence/ZendOptimizerPlus Conflicts: Optimizer/block_pass.c Changed paths: MM Optimizer/block_pass.c Diff: diff --cc Optimizer/block_pass.c index 7c37da4,77af8d7..af2f158 --- a/Optimizer/block_pass.c +++ b/Optimizer/block_pass.c @@@ -278,10 -229,17 +278,10 @@@ static int find_code_blocks(zend_op_arr } } cur_block->len = end - cur_block->start_opline; - cur_block->next = &blocks[op_array->last+1]; + cur_block->next = &blocks[op_array->last + 1]; print_block(cur_block, op_array->opcodes, ""); - /* The op_array doesn't have BRK, CONT, GOTO opcodes anyway */ - if (op_array->brk_cont_array) { - efree(op_array->brk_cont_array); - } - op_array->brk_cont_array = NULL; - op_array->last_brk_cont = 0; - - return blocks; + return 1; } /* CFG back references management */ @@@ -1128,10 -1085,9 +1128,10 @@@ static void zend_optimize_block(zend_co } /* Rebuild plain (optimized) op_array from CFG */ -static void assemble_code_blocks(zend_code_block *blocks, zend_op_array *op_array) +static void assemble_code_blocks(zend_cfg *cfg, zend_op_array *op_array) { + zend_code_block *blocks = cfg->blocks; - zend_op *new_opcodes = emalloc(op_array->last*sizeof(zend_op)); + zend_op *new_opcodes = emalloc(op_array->last * sizeof(zend_op)); zend_op *opline = new_opcodes; zend_code_block *cur_block = blocks; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
