Remove (compact) unused constants after SCCP pass

Author: dstogov

ext/opcache/Optimizer/zend_optimizer.c

@@ -1008,7 +1008,9 @@ static void zend_optimize(zend_op_array      *op_array,
 	/* pass 11:
 	 * - Compact literals table
 	 */
-	if (ZEND_OPTIMIZER_PASS_11 & ctx->optimization_level) {
+	if ((ZEND_OPTIMIZER_PASS_11 & ctx->optimization_level) &&
+	    (!(ZEND_OPTIMIZER_PASS_6 & ctx->optimization_level) ||
+	     !(ZEND_OPTIMIZER_PASS_7 & ctx->optimization_level))) {
 		zend_optimizer_compact_literals(op_array, ctx);
 		if (ctx->debug_level & ZEND_DUMP_AFTER_PASS_11) {
 			zend_dump_op_array(op_array, 0, "after pass 11", NULL);
@@ -1221,6 +1223,15 @@ int zend_optimize_script(zend_script *script, zend_long optimization_level, zend
 			}
 		}
 
+		if (ZEND_OPTIMIZER_PASS_11 & optimization_level) {
+			for (i = 0; i < call_graph.op_arrays_count; i++) {
+				zend_optimizer_compact_literals(call_graph.op_arrays[i], &ctx);
+				if (debug_level & ZEND_DUMP_AFTER_PASS_11) {
+					zend_dump_op_array(call_graph.op_arrays[i], 0, "after pass 11", NULL);
+				}
+			}
+		}
+
 		if (ZEND_OPTIMIZER_PASS_12 & optimization_level) {
 			for (i = 0; i < call_graph.op_arrays_count; i++) {
 				zend_adjust_fcall_stack_size_graph(call_graph.op_arrays[i]);