Index: /trunk/xcache.c
===================================================================
--- /trunk/xcache.c	(revision 827)
+++ /trunk/xcache.c	(revision 832)
@@ -1178,4 +1178,6 @@
 /* {{{ Constant Usage */
 #ifdef ZEND_ENGINE_2_4
+#	define xcache_literal_is_dir  1
+#	define xcache_literal_is_file 2
 #else
 #	define xcache_op1_is_file 1
@@ -1193,16 +1195,22 @@
 static void xc_collect_op_array_info(xc_entry_t *xce, xc_entry_data_php_t *php, xc_const_usage_t *usage, xc_op_array_info_t *op_array_info, zend_op_array *op_array TSRMLS_DC) /* {{{ */
 {
-#ifdef ZEND_ENGINE_2_4
-	int oplineno;
-#else
-	int oplineno;
-#endif
-	xc_vector_t vector_int;
-
-	xc_vector_init(int, &vector_int);
-
-#ifdef ZEND_ENGINE_2_4
-#else
-#define XCACHE_CHECK_OP(type, op) \
+	int i;
+	xc_vector_t details;
+
+	xc_vector_init(xc_op_array_info_detail_t, &details);
+
+#define XCACHE_ANALYZE_LITERAL(type) \
+	if (zend_binary_strcmp(Z_STRVAL(literal->constant), Z_STRLEN(literal->constant), xce->type##path, xce->type##path_len) == 0) { \
+		usage->type##path_used = 1; \
+		literalinfo |= xcache_##literal##_is_##type; \
+	}
+
+#define XCACHE_U_ANALYZE_LITERAL(type) \
+	if (zend_u_##binary_strcmp(Z_USTRVAL(literal->constant), Z_USTRLEN(literal->constant), xce->u##type##path, xce->u##type##path_len) == 0) { \
+		usage->u##type##path_used = 1; \
+		literalinfo |= xcache_##literal##_is_##type; \
+	}
+
+#define XCACHE_ANALYZE_OP(type, op) \
 	if (zend_binary_strcmp(Z_STRVAL(Z_OP_CONSTANT(opline->op)), Z_STRLEN(Z_OP_CONSTANT(opline->op)), xce->type##path, xce->type##path_len) == 0) { \
 		usage->type##path_used = 1; \
@@ -1210,5 +1218,5 @@
 	}
 
-#define XCACHE_U_CHECK_OP(type, op) \
+#define XCACHE_U_ANALYZE_OP(type, op) \
 	if (zend_u_##binary_strcmp(Z_USTRVAL(Z_OP_CONSTANT(opline->op)), Z_USTRLEN(Z_OP_CONSTANT(opline->op)), xce->u##type##path, xce->u##type##path_len) == 0) { \
 		usage->u##type##path_used = 1; \
@@ -1216,72 +1224,139 @@
 	}
 
-	for (oplineno = 0; oplineno < op_array->last; oplineno++) {
-		zend_op *opline = &op_array->opcodes[oplineno];
-		int oplineinfo = 0;
+#ifdef ZEND_ENGINE_2_4
+	for (i = 0; i < op_array->last_literal; i++) {
+		zend_literal *literal = &op_array->literals[i];
+		zend_uint literalinfo = 0;
+		if (Z_TYPE(literal->constant) == IS_STRING) {
+			XCACHE_ANALYZE_LITERAL(file)
+			else XCACHE_ANALYZE_LITERAL(dir)
+		}
+#ifdef IS_UNICODE
+		else if (Z_TYPE(literal->constant) == IS_UNICODE) {
+			XCACHE_U_ANALYZE_LITERAL(file)
+			else XCACHE_U_ANALYZE_LITERAL(dir)
+		}
+#endif
+		if (literalinfo) {
+			xc_op_array_info_detail_t detail;
+			detail.index = i;
+			detail.info  = literalinfo;
+			xc_vector_add(xc_op_array_info_detail_t, &details, detail);
+		}
+	}
+
+	op_array_info->literalinfo_cnt = details.cnt;
+	op_array_info->literalinfos    = xc_vector_detach(xc_op_array_info_detail_t, &details);
+#else /* ZEND_ENGINE_2_4 */
+	for (i = 0; i < op_array->last; i++) {
+		zend_op *opline = &op_array->opcodes[i];
+		zend_uint oplineinfo = 0;
 		if (Z_OP_TYPE(opline->op1) == IS_CONST) {
 			if (Z_TYPE(Z_OP_CONSTANT(opline->op1)) == IS_STRING) {
-				XCACHE_CHECK_OP(file, op1)
-				else XCACHE_CHECK_OP(dir, op1)
-			}
-
+				XCACHE_ANALYZE_OP(file, op1)
+				else XCACHE_ANALYZE_OP(dir, op1)
+			}
 #ifdef IS_UNICODE
 			else if (Z_TYPE(Z_OP_CONSTANT(opline->op1)) == IS_UNICODE) {
-				XCACHE_U_CHECK_OP(file, op1)
-				else XCACHE_U_CHECK_OP(dir, op1)
-			}
-#endif
-		}
+				XCACHE_U_ANALYZE_OP(file, op1)
+				else XCACHE_U_ANALYZE_OP(dir, op1)
+			}
+#endif
+		}
+
 		if (Z_OP_TYPE(opline->op2) == IS_CONST) {
 			if (Z_TYPE(Z_OP_CONSTANT(opline->op2)) == IS_STRING) {
-				XCACHE_CHECK_OP(file, op2)
-				else XCACHE_CHECK_OP(dir, op2)
-			}
-
+				XCACHE_ANALYZE_OP(file, op2)
+				else XCACHE_ANALYZE_OP(dir, op2)
+			}
 #ifdef IS_UNICODE
 			else if (Z_TYPE(Z_OP_CONSTANT(opline->op2)) == IS_UNICODE) {
-				XCACHE_U_CHECK_OP(file, op2)
-				else XCACHE_U_CHECK_OP(dir, op2)
-			}
-#endif
-		}
+				XCACHE_U_ANALYZE_OP(file, op2)
+				else XCACHE_U_ANALYZE_OP(dir, op2)
+			}
+#endif
+		}
+
 		if (oplineinfo) {
-			xc_vector_add(int, &vector_int, oplineno);
-			xc_vector_add(int, &vector_int, oplineinfo);
-		}
-	}
-
-	op_array_info->oplineinfo_cnt = vector_int.cnt;
-	op_array_info->oplineinfos    = xc_vector_detach(int, &vector_int);
-#endif
-	xc_vector_free(int, &vector_int);
-}
-/* }}} */
-void xc_fix_op_array_info(const xc_entry_t *xce, const xc_entry_data_php_t *php, zend_op_array *op_array, int copy, const xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */
-{
+			xc_op_array_info_detail_t detail;
+			detail.index = i;
+			detail.info  = oplineinfo;
+			xc_vector_add(xc_op_array_info_detail_t, &details, detail);
+		}
+	}
+
+	op_array_info->oplineinfo_cnt = details.cnt;
+	op_array_info->oplineinfos    = xc_vector_detach(xc_op_array_info_detail_t, &details);
+#endif /* ZEND_ENGINE_2_4 */
+	xc_vector_free(xc_op_array_info_detail_t, &details);
+}
+/* }}} */
+void xc_fix_op_array_info(const xc_entry_t *xce, const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copy, const xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */
+{
+	int i;
+
 #ifdef ZEND_ENGINE_2_4
+	for (i = 0; i < op_array_info->literalinfo_cnt; ++i) {
+		int index = op_array_info->literalinfos[i].index;
+		int literalinfo = op_array_info->literalinfos[i].info;
+		zend_literal *literal = &op_array->literals[index];
+		if ((literalinfo & xcache_literal_is_file)) {
+			if (!shallow_copy) {
+				efree(Z_STRVAL(literal->constant));
+			}
+			if (Z_TYPE(literal->constant) == IS_STRING) {
+				assert(xce->filepath);
+				ZVAL_STRINGL(&literal->constant, xce->filepath, xce->filepath_len, !shallow_copy);
+				TRACE("restored literal constant: %s", xce->filepath);
+			}
+#ifdef IS_UNICODE
+			else if (Z_TYPE(literal->constant) == IS_UNICODE) {
+				assert(xce->ufilepath);
+				ZVAL_UNICODEL(&literal->constant, xce->ufilepath, xce->ufilepath_len, !shallow_copy);
+			}
+#endif
+			else {
+				assert(0);
+			}
+		}
+		else if ((literalinfo & xcache_literal_is_dir)) {
+			if (!shallow_copy) {
+				efree(Z_STRVAL(literal->constant));
+			}
+			if (Z_TYPE(literal->constant) == IS_STRING) {
+				assert(xce->dirpath);
+				TRACE("restored literal constant: %s", xce->dirpath);
+				ZVAL_STRINGL(&literal->constant, xce->dirpath, xce->dirpath_len, !shallow_copy);
+			}
+#ifdef IS_UNICODE
+			else if (Z_TYPE(literal->constant) == IS_UNICODE) {
+				assert(!xce->udirpath);
+				ZVAL_UNICODEL(&literal->constant, xce->udirpath, xce->udirpath_len, !shallow_copy);
+			}
+#endif
+			else {
+				assert(0);
+			}
+		}
+	}
 #else
-	int i;
-#endif
-
-#ifdef ZEND_ENGINE_2_4
-#else
-	for (i = 0; i < op_array_info->oplineinfo_cnt; i += 2) {
-		int oplineno = op_array_info->oplineinfos[i];
-		int oplineinfo = op_array_info->oplineinfos[i + 1];
+	for (i = 0; i < op_array_info->oplineinfo_cnt; ++i) {
+		int oplineno = op_array_info->oplineinfos[i].index;
+		int oplineinfo = op_array_info->oplineinfos[i].info;
 		zend_op *opline = &op_array->opcodes[oplineno];
 		if ((oplineinfo & xcache_op1_is_file)) {
 			assert(Z_OP_TYPE(opline->op1) == IS_CONST);
-			if (copy) {
+			if (!shallow_copy) {
 				efree(Z_STRVAL(Z_OP_CONSTANT(opline->op1)));
 			}
 			if (Z_TYPE(Z_OP_CONSTANT(opline->op1)) == IS_STRING) {
 				assert(xce->filepath);
-				ZVAL_STRINGL(&Z_OP_CONSTANT(opline->op1), xce->filepath, xce->filepath_len, copy);
-				TRACE("fixing op1 to %s", xce->filepath);
+				ZVAL_STRINGL(&Z_OP_CONSTANT(opline->op1), xce->filepath, xce->filepath_len, !shallow_copy);
+				TRACE("restored op1 constant: %s", xce->filepath);
 			}
 #ifdef IS_UNICODE
 			else if (Z_TYPE(Z_OP_CONSTANT(opline->op1)) == IS_UNICODE) {
 				assert(xce->ufilepath);
-				ZVAL_UNICODEL(&Z_OP_CONSTANT(opline->op1), xce->ufilepath, xce->ufilepath_len, copy);
+				ZVAL_UNICODEL(&Z_OP_CONSTANT(opline->op1), xce->ufilepath, xce->ufilepath_len, !shallow_copy);
 			}
 #endif
@@ -1292,16 +1367,16 @@
 		else if ((oplineinfo & xcache_op1_is_dir)) {
 			assert(Z_OP_TYPE(opline->op1) == IS_CONST);
-			if (copy) {
+			if (!shallow_copy) {
 				efree(Z_STRVAL(Z_OP_CONSTANT(opline->op1)));
 			}
 			if (Z_TYPE(Z_OP_CONSTANT(opline->op1)) == IS_STRING) {
 				assert(xce->dirpath);
-				TRACE("fixing op1 to %s", xce->dirpath);
-				ZVAL_STRINGL(&Z_OP_CONSTANT(opline->op1), xce->dirpath, xce->dirpath_len, copy);
+				TRACE("restored op1 constant: %s", xce->dirpath);
+				ZVAL_STRINGL(&Z_OP_CONSTANT(opline->op1), xce->dirpath, xce->dirpath_len, !shallow_copy);
 			}
 #ifdef IS_UNICODE
 			else if (Z_TYPE(Z_OP_CONSTANT(opline->op1)) == IS_UNICODE) {
 				assert(!xce->udirpath);
-				ZVAL_UNICODEL(&Z_OP_CONSTANT(opline->op1), xce->udirpath, xce->udirpath_len, copy);
+				ZVAL_UNICODEL(&Z_OP_CONSTANT(opline->op1), xce->udirpath, xce->udirpath_len, !shallow_copy);
 			}
 #endif
@@ -1313,16 +1388,16 @@
 		if ((oplineinfo & xcache_op2_is_file)) {
 			assert(Z_OP_TYPE(opline->op2) == IS_CONST);
-			if (copy) {
+			if (!shallow_copy) {
 				efree(Z_STRVAL(Z_OP_CONSTANT(opline->op2)));
 			}
 			if (Z_TYPE(Z_OP_CONSTANT(opline->op2)) == IS_STRING) {
 				assert(xce->filepath);
-				TRACE("fixing op2 to %s", xce->filepath);
-				ZVAL_STRINGL(&Z_OP_CONSTANT(opline->op2), xce->filepath, xce->filepath_len, copy);
+				TRACE("restored op2 constant: %s", xce->filepath);
+				ZVAL_STRINGL(&Z_OP_CONSTANT(opline->op2), xce->filepath, xce->filepath_len, !shallow_copy);
 			}
 #ifdef IS_UNICODE
 			else if (Z_TYPE(Z_OP_CONSTANT(opline->op2)) == IS_UNICODE) {
 				assert(xce->ufilepath);
-				ZVAL_UNICODEL(&Z_OP_CONSTANT(opline->op2), xce->ufilepath, xce->ufilepath_len, copy);
+				ZVAL_UNICODEL(&Z_OP_CONSTANT(opline->op2), xce->ufilepath, xce->ufilepath_len, !shallow_copy);
 			}
 #endif
@@ -1333,16 +1408,16 @@
 		else if ((oplineinfo & xcache_op2_is_dir)) {
 			assert(Z_OP_TYPE(opline->op2) == IS_CONST);
-			if (copy) {
+			if (!shallow_copy) {
 				efree(Z_STRVAL(Z_OP_CONSTANT(opline->op2)));
 			}
 			if (Z_TYPE(Z_OP_CONSTANT(opline->op2)) == IS_STRING) {
 				assert(!xce->dirpath);
-				TRACE("fixing op2 to %s", xce->dirpath);
-				ZVAL_STRINGL(&Z_OP_CONSTANT(opline->op2), xce->dirpath, xce->dirpath_len, copy);
+				TRACE("restored op2 constant: %s", xce->dirpath);
+				ZVAL_STRINGL(&Z_OP_CONSTANT(opline->op2), xce->dirpath, xce->dirpath_len, !shallow_copy);
 			}
 #ifdef IS_UNICODE
 			else if (Z_TYPE(Z_OP_CONSTANT(opline->op2)) == IS_UNICODE) {
 				assert(!xce->udirpath);
-				ZVAL_UNICODEL(&Z_OP_CONSTANT(opline->op2), xce->udirpath, xce->udirpath_len, copy);
+				ZVAL_UNICODEL(&Z_OP_CONSTANT(opline->op2), xce->udirpath, xce->udirpath_len, !shallow_copy);
 			}
 #endif
Index: /trunk/processor/processor.m4
===================================================================
--- /trunk/processor/processor.m4	(revision 830)
+++ /trunk/processor/processor.m4	(revision 832)
@@ -637,14 +637,14 @@
 #endif
 	IFCOPY(`
+#ifdef ZEND_ENGINE_2_4
 		pushdef(`UNION_znode_op_literal', `
-			if (dst->$1_type == IS_CONST) {
-				IFSTORE(`
-					dst->$1.constant = src->$1.literal - processor->active_op_array_src->literals;
-					dst->$1.literal = &processor->active_op_array_dst->literals[dst->$1.constant];
-				')
+			if (src->$1_type == IS_CONST) {
+				dst->$1.constant = src->$1.literal - processor->active_op_array_src->literals;
+				dst->$1.literal = &processor->active_op_array_dst->literals[dst->$1.constant];
 			}
 		')
 		UNION_znode_op_literal(op1)
 		UNION_znode_op_literal(op2)
+#endif
 		popdef(`UNION_znode_op_literal')
 		switch (src->opcode) {
@@ -925,5 +925,5 @@
 #endif
 	} while (0);
-	IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);')
+	IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, shallow_copy, op_array_info TSRMLS_CC);')
 
 #ifdef ZEND_ENGINE_2
@@ -991,11 +991,16 @@
 dnl }}}
 #endif
+DEF_STRUCT_P_FUNC(`xc_op_array_info_detail_t', , `dnl {{{
+	DISPATCH(zend_uint, index)
+	DISPATCH(zend_uint, info)
+')
+dnl }}}
 DEF_STRUCT_P_FUNC(`xc_op_array_info_t', , `dnl {{{
 #ifdef ZEND_ENGINE_2_4
 	DISPATCH(zend_uint, literalinfo_cnt)
-	DISPATCH_ARRAY(literalinfo_cnt, int, literalinfos)
+	STRUCT_ARRAY(literalinfo_cnt, xc_op_array_info_detail_t, literalinfos)
 #else
 	DISPATCH(zend_uint, oplineinfo_cnt)
-	DISPATCH_ARRAY(oplineinfo_cnt, int, oplineinfos)
+	STRUCT_ARRAY(oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos)
 #endif
 ')
Index: /trunk/xcache.h
===================================================================
--- /trunk/xcache.h	(revision 823)
+++ /trunk/xcache.h	(revision 832)
@@ -272,12 +272,18 @@
 } xc_cache_t;
 /* }}} */
+/* {{{ xc_op_array_info_detail_t */
+typedef struct {
+	zend_uint index;
+	zend_uint info;
+} xc_op_array_info_detail_t;
+/* }}} */
 /* {{{ xc_op_array_info_t */
 typedef struct {
 #ifdef ZEND_ENGINE_2_4
 	zend_uint literalinfo_cnt;
-	int *literalinfos;
+	xc_op_array_info_detail_t *literalinfos;
 #else
 	zend_uint oplineinfo_cnt;
-	int *oplineinfos;
+	xc_op_array_info_detail_t *oplineinfos;
 #endif
 } xc_op_array_info_t;
@@ -459,5 +465,5 @@
 /* }}} */
 void xc_gc_add_op_array(xc_gc_op_array_t *gc_op_array TSRMLS_DC);
-void xc_fix_op_array_info(const xc_entry_t *xce, const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copied, const xc_op_array_info_t *op_array_info TSRMLS_DC);
+void xc_fix_op_array_info(const xc_entry_t *xce, const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copy, const xc_op_array_info_t *op_array_info TSRMLS_DC);
 
 #endif /* __XCACHE_H */