Tweak

Author: nielsdos

Zend/Optimizer/dfa_pass.c

@@ -1131,6 +1131,14 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 		ssa_verify_integrity(op_array, ssa, "before dfa");
 #endif
 
+		/* Optimization should not be done on main because of globals. */
+		if (op_array->function_name) {
+			zend_dfa_optimize_send_copies(op_array, ssa);
+#if ZEND_DEBUG_DFA
+			ssa_verify_integrity(op_array, ssa, "after optimize send copies");
+#endif
+		}
+
 		if (ZEND_OPTIMIZER_PASS_8 & ctx->optimization_level) {
 			if (sccp_optimize_op_array(ctx, op_array, ssa, call_map)) {
 				remove_nops = 1;
@@ -1171,14 +1179,6 @@ void zend_dfa_optimize_op_array(zend_op_array *op_array, zend_optimizer_ctx *ctx
 #endif
 		}
 
-		/* Optimization should not be done on main because of globals. */
-		if (op_array->function_name) {
-			zend_dfa_optimize_send_copies(op_array, ssa);
-#if ZEND_DEBUG_DFA
-			ssa_verify_integrity(op_array, ssa, "after optimize send copies");
-#endif
-		}
-
 		for (v = op_array->last_var; v < ssa->vars_count; v++) {
 
 			op_1 = ssa->vars[v].definition;

Zend/Optimizer/sccp.c

@@ -1053,7 +1053,12 @@ static void sccp_visit_instr(scdf_ctx *scdf, zend_op *opline, zend_ssa_op *ssa_o
 			SKIP_IF_TOP(op1);
 
 			if (opline->opcode == ZEND_SEND_VAR) {
-				SET_RESULT(op1, op1);
+				if (opline->extended_value) {
+					ZVAL_UNDEF(&zv);
+					SET_RESULT(op1, &zv);
+				} else {
+					SET_RESULT(op1, op1);
+				}
 			}
 
 			/* If the value of a SEND for an ICALL changes, we need to reconsider the
@@ -2346,8 +2351,11 @@ static int replace_constant_operands(sccp_ctx *ctx) {
 		FOREACH_USE(var, use) {
 			zend_op *opline = &op_array->opcodes[use];
 			zend_ssa_op *ssa_op = &ssa->ops[use];
+			/* Removing the def in try_remove_definition() may reduce optimisation opportunities.
+			 * So only remove it when we actually want to replace it (?) */ // TODO
 			if (opline->opcode == ZEND_SEND_VAR && ssa_op->op1_use == i && ssa_op->op1_def >= 0) {
 				zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
+				opline->extended_value = 0;
 			}
 			if (try_replace_op1(ctx, opline, ssa_op, i, value)) {
 				if (opline->opcode == ZEND_NOP) {

Zend/Optimizer/zend_inference.c

@@ -2951,6 +2951,7 @@ static zend_always_inline zend_result _zend_update_type_info(
 					tmp |= MAY_BE_RCN;
 				}
 				if ((t1 & (MAY_BE_ARRAY|MAY_BE_STRING)) && (t1 & MAY_BE_RC1) && !(t1 & (MAY_BE_UNDEF|MAY_BE_REF)) && ssa_vars[ssa_op->op1_def].no_val && !ssa_vars[ssa_op->op1_def].alias) {
+					/* implicit move may make value undef */
 					tmp |= MAY_BE_UNDEF;
 				}
 				UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);
@@ -2995,6 +2996,7 @@ static zend_always_inline zend_result _zend_update_type_info(
 			if (ssa_op->op1_def >= 0) {
 				tmp = (t1 & MAY_BE_UNDEF)|MAY_BE_REF|MAY_BE_RC1|MAY_BE_RCN|MAY_BE_ANY|MAY_BE_ARRAY_KEY_ANY|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF;
 				if (opline->opcode == ZEND_SEND_VAR_EX && (t1 & (MAY_BE_ARRAY|MAY_BE_STRING)) && (t1 & MAY_BE_RC1) && !(t1 & (MAY_BE_UNDEF|MAY_BE_REF)) && ssa_vars[ssa_op->op1_def].no_val && !ssa_vars[ssa_op->op1_def].alias) {
+					/* implicit move may make value undef */
 					tmp |= MAY_BE_UNDEF;
 				}
 				UPDATE_SSA_TYPE(tmp, ssa_op->op1_def);