Changeset 845

Timestamp:

03/25/2012 06:32:20 PM (14 months ago)

Author:

moo

Message:

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

Files:

• trunk/optimizer.c (modified) (4 diffs)

trunk/optimizer.c

@@ -57 +57 @@
 {
     int i;
-    zend_bool preserve_brk_cont_array = 0;
 
     if (op_array->brk_cont_array == NULL) {
@@ -76 +75 @@
 #ifdef ZEND_GOTO
         case ZEND_GOTO:
-            preserve_brk_cont_array = 1;
+#endif
             continue;
-#endif
 
         default:
@@ -109 +107 @@
                     if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN)) {
                         can_convert = 0;
-                        preserve_brk_cont_array = 1;
                     }
                     break;
@@ -133 +130 @@
     }
 
-    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;
 }