From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 25 Feb 2013 10:55:27 +0000 (+0400)
Subject: Merge branch 'master' of https://github.com/laruence/ZendOptimizerPlus
X-Git-Tag: php-5.5.0beta1~42^2~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56baf17a17d102108a4f66f2b4ccafcd7db5468b;p=php

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

Conflicts:
	Optimizer/block_pass.c
---

56baf17a17d102108a4f66f2b4ccafcd7db5468b
diff --cc Optimizer/block_pass.c
index 7c37da4fc0,77af8d70cb..af2f158918
--- 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;