archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed live-range construction for OP_DATA opcode

Browse source 
Added comments about algorithm assumtions
This commit is contained in:
Dmitry Stogov 2015-07-06 16:05:33 +03:00
parent 521ad9df98
commit 0bda4abea7
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Zend/zend_opcode.c
View file

@ -853,6 +853,10 @@ typedef struct _op_var_info {
uint32_t var;
} op_var_info;
/* The following liveliness analyzing algorithm assumes that
* 1) temporary variables are defined before use
* 2) they have linear live-ranges without "holes"
*/
ZEND_API uint32_t *generate_var_liveliness_info(zend_op_array *op_array)
{
uint32_t i, op_live_total = 0;
@ -942,9 +946,10 @@ ZEND_API uint32_t *generate_var_liveliness_info(zend_op_array *op_array)
ZEND_ASSERT(T->end != (uint32_t) -1);
j = T->start + 1;
if (op_array->opcodes[j].opcode == ZEND_FE_FETCH_R
if (op_array->opcodes[j].opcode == ZEND_OP_DATA
|| op_array->opcodes[j].opcode == ZEND_FE_FETCH_R
|| op_array->opcodes[j].opcode == ZEND_FE_FETCH_RW) {
/* On exception FE_FETCH destroys loop vatriable itself */
/* On exception TMP variable is destroyed by current opcode */
j++;
}