Move some stuff

Author: nielsdos

Zend/Optimizer/dfa_pass.c

@@ -1078,7 +1078,7 @@ static void zend_dfa_optimize_send_copies(zend_op_array *op_array, zend_ssa *ssa
 	}
 
 	for (uint32_t i = 0; i < op_array->last; i++) {
-		const zend_op *opline = &op_array->opcodes[i];
+		zend_op *opline = op_array->opcodes + i;
 		if ((opline->opcode != ZEND_SEND_VAR && opline->opcode != ZEND_SEND_VAR_EX) || opline->op2_type != IS_UNUSED || opline->op1_type != IS_CV) {
 			continue;
 		}
@@ -1105,14 +1105,11 @@ static void zend_dfa_optimize_send_copies(zend_op_array *op_array, zend_ssa *ssa
 			continue;
 		}
 
-		zend_ssa_var *ssa_var = &ssa->vars[op1_def];
+		zend_ssa_var *ssa_var = ssa->vars + op1_def;
 
-		/* If the variable's value does not matter, it does not alias, but it is used;
-		 * then it means its use will override the value and we can perform the implicit move optimization. */
-		if (ssa_var->no_val && !ssa_var->alias/* && ssa_var->use_chain >= 0*/) {
+		if (ssa_var->no_val && !ssa_var->alias) {
 			/* Flag will be used by VM type spec handler */
-			op_array->opcodes[i].extended_value = 1;
-			//fprintf(stderr, "optimized\n");
+			opline->extended_value = 1;
 		} else if (opline->opcode == ZEND_SEND_VAR) {
 			zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
 		}
@@ -1137,6 +1134,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;
@@ -1177,14 +1182,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;