disable optimizer for PHP 5.5 for now. TODO: support for finally_op/finally_end

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1278 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

mod_optimizer/xc_optimizer.c

@@ -46,6 +46,9 @@ typedef struct _bb_t {
 #ifdef ZEND_ENGINE_2
 	bbid_t     catch;
 #endif
+#ifdef ZEND_ENGINE_2_5
+	bbid_t     finally;
+#endif
 
 	zend_uint  opnum; /* opnum after joining basic block */
 } bb_t;
@@ -153,7 +156,6 @@ static int op_get_flowinfo(op_flowinfo_t *fi, zend_op *opline) /* {{{ */
 {
 	op_flowinfo_init(fi);
 
-	/* break=will fall */
 	switch (opline->opcode) {
 #ifdef ZEND_HANDLE_EXCEPTION
 	case ZEND_HANDLE_EXCEPTION:
@@ -204,20 +206,19 @@ static int op_get_flowinfo(op_flowinfo_t *fi, zend_op *opline) /* {{{ */
 #endif      
 	case ZEND_FE_FETCH:
 		fi->jmpout_op2 = Z_OP(opline->op2).opline_num;
-		break;
+		fi->fall = 1;
+		return SUCCESS;
 
 #ifdef ZEND_CATCH
 	case ZEND_CATCH:
 		fi->jmpout_ext = (int) opline->extended_value;
-		break;
+		fi->fall = 1;
+		return SUCCESS;
 #endif
 
 	default:
 		return FAILURE;
 	}
-
-	fi->fall = 1;
-	return SUCCESS;
 }
 /* }}} */
 #ifdef XCACHE_DEBUG
@@ -295,6 +296,9 @@ static bb_t *bb_new_ex(zend_op *opcodes, int count) /* {{{ */
 #ifdef ZEND_ENGINE_2
 	bb->catch      = BBID_INVALID;
 #endif
+#ifdef ZEND_ENGINE_2_5
+	bb->finally    = BBID_INVALID;
+#endif
 
 	if (opcodes) {
 		bb->alloc   = 0;
@@ -325,11 +329,12 @@ static void bb_print(bb_t *bb, zend_op_array *op_array) /* {{{ */
 	int line = bb->opcodes - op_array->opcodes;
 	op_flowinfo_t fi;
 	zend_op *last = bb->opcodes + bb->count - 1;
-	bbid_t catchbbid;
-#ifdef ZEND_ENGINE_2
-	catchbbid = BBID_INVALID;
+	bbid_t catchbbid = ZESW(BBID_INVALID, bb->catch);
+	bbid_t finallybbid;
+#ifdef ZEND_ENGINE_2_5
+	finallybbid = BBID_INVALID;
 #else
-	catchbbid = bb->catch;
+	finallybbid = bb->finally;
 #endif
 
 	op_get_flowinfo(&fi, last);
@@ -398,11 +403,19 @@ static int bbs_build_from(bbs_t *bbs, zend_op_array *op_array, int count) /* {{{
 	op_flowinfo_t fi;
 	zend_op *opline;
 	ALLOCA_FLAG(use_heap_bbids)
+#ifdef ZEND_ENGINE_2
 	ALLOCA_FLAG(use_heap_catchbbids)
+#endif
+#ifdef ZEND_ENGINE_2_5
+	ALLOCA_FLAG(use_heap_finallybbids)
+#endif
 	ALLOCA_FLAG(use_heap_markbbhead)
 	bbid_t *bbids          = xc_do_alloca(count * sizeof(bbid_t),    use_heap_bbids);
 #ifdef ZEND_ENGINE_2
 	bbid_t *catchbbids     = xc_do_alloca(count * sizeof(bbid_t),    use_heap_catchbbids);
+#endif
+#ifdef ZEND_ENGINE_2_5
+	bbid_t *finallybbids   = xc_do_alloca(count * sizeof(bbid_t),    use_heap_finallybbids);
 #endif
 	zend_bool *markbbhead  = xc_do_alloca(count * sizeof(zend_bool), use_heap_markbbhead);
 
@@ -514,6 +527,9 @@ static int bbs_build_from(bbs_t *bbs, zend_op_array *op_array, int count) /* {{{
 	xc_free_alloca(markbbhead, use_heap_markbbhead);
 #ifdef ZEND_ENGINE_2
 	xc_free_alloca(catchbbids, use_heap_catchbbids);
+#endif
+#ifdef ZEND_ENGINE_2_5
+	xc_free_alloca(finallybbids, use_heap_finallybbids);
 #endif
 	xc_free_alloca(bbids,      use_heap_bbids);
 	return SUCCESS;
@@ -526,6 +542,9 @@ static void bbs_restore_opnum(bbs_t *bbs, zend_op_array *op_array) /* {{{ */
 	bbid_t lasttrybbid;
 	bbid_t lastcatchbbid;
 #endif
+#ifdef ZEND_ENGINE_2_5
+	bbid_t lastfinallybbid;
+#endif
 
 	for (i = 0; i < bbs_count(bbs); i ++) {
 		op_flowinfo_t fi;
@@ -551,20 +570,29 @@ static void bbs_restore_opnum(bbs_t *bbs, zend_op_array *op_array) /* {{{ */
 #ifdef ZEND_ENGINE_2
 	lasttrybbid   = BBID_INVALID;
 	lastcatchbbid = BBID_INVALID;
+#ifdef ZEND_ENGINE_2_5
+	lastfinallybbid = BBID_INVALID;
+#endif
 	op_array->last_try_catch = 0;
 	for (i = 0; i < bbs_count(bbs); i ++) {
 		bb_t *bb = bbs_get(bbs, i);
 
 		if (lastcatchbbid != bb->catch) {
-			if (lasttrybbid != BBID_INVALID && lastcatchbbid != BBID_INVALID) {
+			if (lasttrybbid != BBID_INVALID) {
 				int try_catch_offset = op_array->last_try_catch ++;
 
 				op_array->try_catch_array = erealloc(op_array->try_catch_array, sizeof(zend_try_catch_element) * op_array->last_try_catch);
 				op_array->try_catch_array[try_catch_offset].try_op = bbs_get(bbs, lasttrybbid)->opnum;
-				op_array->try_catch_array[try_catch_offset].catch_op = bbs_get(bbs, lastcatchbbid)->opnum;
+				op_array->try_catch_array[try_catch_offset].catch_op = lastcatchbbid != BBID_INVALID ? bbs_get(bbs, lastcatchbbid)->opnum : 0;
+#ifdef ZEND_ENGINE_2_5
+				op_array->try_catch_array[try_catch_offset].finally_op = lastfinallybbid != BBID_INVALID ? bbs_get(bbs, lastfinallybbid)->opnum : 0;
+#endif
 			}
 			lasttrybbid   = i;
 			lastcatchbbid = bb->catch;
+#ifdef ZEND_ENGINE_2_5
+			lastfinallybbid = bb->finally;
+#endif
 		}
 	}
 	/* it is impossible to have last bb catched */

xcache.c

@@ -809,7 +809,9 @@ static PHP_MINIT_FUNCTION(xcache) /* {{{ */
 	/* must be the first */
 	xcache_zend_extension_add(&xc_zend_extension_entry, 1);
 #ifdef HAVE_XCACHE_OPTIMIZER
+#	ifndef ZEND_ENGINE_2_5
 	xc_optimizer_startup_module();
+#	endif
 #endif
 #ifdef HAVE_XCACHE_CACHER
 	xc_cacher_startup_module();