Browse Source

do not opt out brk_cont_array in any case as it is required by ZEND_HANDLE_EXCEPTION

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@845 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 10 years ago
parent
commit
1dc5c4ae24
  1. 12
      optimizer.c

12
optimizer.c

@ -56,7 +56,6 @@ typedef xc_stack_t bbs_t;
static int op_array_convert_switch(zend_op_array *op_array) /* {{{ */
{
int i;
zend_bool preserve_brk_cont_array = 0;
if (op_array->brk_cont_array == NULL) {
return SUCCESS;
@ -75,9 +74,8 @@ static int op_array_convert_switch(zend_op_array *op_array) /* {{{ */
#ifdef ZEND_GOTO
case ZEND_GOTO:
preserve_brk_cont_array = 1;
continue;
#endif
continue;
default:
continue;
@ -108,7 +106,6 @@ static int op_array_convert_switch(zend_op_array *op_array) /* {{{ */
case ZEND_FREE:
if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN)) {
can_convert = 0;
preserve_brk_cont_array = 1;
}
break;
}
@ -132,13 +129,6 @@ static int op_array_convert_switch(zend_op_array *op_array) /* {{{ */
}
}
if (!preserve_brk_cont_array) {
if (op_array->brk_cont_array != NULL) {
efree(op_array->brk_cont_array);
op_array->brk_cont_array = NULL;
}
op_array->last_brk_cont = 0;
}
return SUCCESS;
}
/* }}} */

Loading…
Cancel
Save