Merge branch 'master' of https://github.com/laruence/ZendOptimizerPlus

Conflicts:
	Optimizer/block_pass.c

diff --cc Optimizer/block_pass.c
index 7c37da4fc0a99ef5ae6fcb6eb4c64f6cd9bb64b8,77af8d70cb601411ef4b66edfbe63d9dfde63656..af2f1589188e00a8dbbe2e4437e3f3c9b800b0e5
--- 1/Optimizer/block_pass.c
--- 2/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_op *new_opcodes = emalloc(op_array->last*sizeof(zend_op));
 +      zend_code_block *blocks = cfg->blocks;
+       zend_op *new_opcodes = emalloc(op_array->last * sizeof(zend_op));
        zend_op *opline = new_opcodes;
        zend_code_block *cur_block = blocks;