Changeset 335

Timestamp:

2006-12-17T04:17:52+01:00 (6 years ago)

Author:

moo

Message:

optimizer: remove double xc_undo_pass_two/xc_redo_pass_two, avoid optimize more than once on same op_array

File:

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

trunk/optimizer.c

@@ -19 +19 @@
 #   define XCACHE_IS_CV 16
 #endif
+#define optimized_flag done_pass_two
 
 typedef int bbid_t;
@@ -511 +512 @@
         return 0;
     }
-    xc_undo_pass_two(op_array TSRMLS_CC);
+
+    /* don't optimize twice */
+    if (op_array->optimized_flag) {
+        return 0;
+    }
+    op_array->optimized_flag = 1;
+
 #ifdef DEBUG
 #   if 0
@@ -543 +550 @@
 #   endif
 #endif
-    xc_redo_pass_two(op_array TSRMLS_CC);
     return 0;
+}
+/* }}} */
+int xc_clear_flag_optimized(zend_op_array *op_array TSRMLS_DC) /* {{{ */
+{
+    op_array->done_pass_two = 0;
 }
 /* }}} */
@@ -558 +569 @@
 
     xc_apply_op_array(&cr, (apply_func_t) xc_undo_pass_two TSRMLS_CC);
+    /* op_array->done_pass_two is now used as if it's op_array->flag_optimized */
     xc_apply_op_array(&cr, (apply_func_t) xc_optimize_op_array TSRMLS_CC);
+    xc_apply_op_array(&cr, (apply_func_t) xc_clear_flag_optimized TSRMLS_CC);
     xc_apply_op_array(&cr, (apply_func_t) xc_redo_pass_two TSRMLS_CC);