Fixed bug #40002 (Try/Catch performs poorly)

diff --git a/NEWS b/NEWS
index 04397ae7bbe1dc8fe01d68ec6e81f5f47f75b9cb..453505dd9f09f7622ea653ee03bb00524c792f2a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP                                                                        NEWS
   CMD.EXE. (Dmitry)  
 - Fixed bug #40036 (empty() does not work correctly with ArrayObject when using
   ARRAY_AS_PROPS). (Ilia)
+- Fixed bug #40002 (Try/Catch performs poorly). (Dmitry)
 - Fixed bug #39979 (PGSQL_CONNECT_FORCE_NEW will causes next connect to
   establish a new connection). (Ilia)
 - Fixed bug #39504 (xmlwriter_write_dtd_entity() creates Attlist tag,

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index f625820e4fe5c2bc919f0c95b64a8523163ba0ee..f7a0012c21a9edd74ee258a87ce029061e95a3e8 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1726,16 +1726,35 @@ void zend_do_first_catch(znode *open_parentheses TSRMLS_DC)
 
 void zend_initialize_try_catch_element(znode *try_token TSRMLS_DC)
 {
+       int jmp_op_number = get_next_op_number(CG(active_op_array));
+       zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+       zend_llist jmp_list;
+       zend_llist *jmp_list_ptr;
+
+       opline->opcode = ZEND_JMP;
+       SET_UNUSED(opline->op1);
+       SET_UNUSED(opline->op2);
+       /* save for backpatching */
+
+       zend_llist_init(&jmp_list, sizeof(int), NULL, 0);
+       zend_stack_push(&CG(bp_stack), (void *) &jmp_list, sizeof(zend_llist));
+       zend_stack_top(&CG(bp_stack), (void **) &jmp_list_ptr);
+       zend_llist_add_element(jmp_list_ptr, &jmp_op_number);
+
        zend_add_catch_element(try_token->u.opline_num, get_next_op_number(CG(active_op_array)) TSRMLS_CC);
 }
 
 
 void zend_do_mark_last_catch(znode *first_catch, znode *last_additional_catch TSRMLS_DC)
 {
+       CG(active_op_array)->last--;
+       zend_do_if_end(TSRMLS_C);
        if (last_additional_catch->u.opline_num == -1) {
                CG(active_op_array)->opcodes[first_catch->u.opline_num].op1.u.EA.type = 1;
+               CG(active_op_array)->opcodes[first_catch->u.opline_num].extended_value = get_next_op_number(CG(active_op_array));
        } else {
                CG(active_op_array)->opcodes[last_additional_catch->u.opline_num].op1.u.EA.type = 1;
+               CG(active_op_array)->opcodes[last_additional_catch->u.opline_num].extended_value = get_next_op_number(CG(active_op_array));
        }
        DEC_BPC(CG(active_op_array));
 }
@@ -1772,6 +1791,18 @@ void zend_do_begin_catch(znode *try_token, znode *catch_class, znode *catch_var,
 
 void zend_do_end_catch(znode *try_token TSRMLS_DC)
 {
+       int jmp_op_number = get_next_op_number(CG(active_op_array));
+       zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
+       zend_llist *jmp_list_ptr;
+
+       opline->opcode = ZEND_JMP;
+       SET_UNUSED(opline->op1);
+       SET_UNUSED(opline->op2);
+       /* save for backpatching */
+
+       zend_stack_top(&CG(bp_stack), (void **) &jmp_list_ptr);
+       zend_llist_add_element(jmp_list_ptr, &jmp_op_number);
+
        CG(active_op_array)->opcodes[try_token->u.opline_num].extended_value = get_next_op_number(CG(active_op_array));
 }