Cleanup and fix condition

Author: nielsdos

Zend/Optimizer/dfa_pass.c

@@ -467,14 +467,9 @@ int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
 							zend_ssa_var *var = ssa->vars + var_num;
 
 							if (ssa_op->op1_def >= 0) {
-								/* TODO: move to somewhere common */
-								int op1_new = ssa_op->op1_use;
-								/* zend_ssa_rename_var_uses() clear use_chain & phi_use_chain for us */
-								zend_ssa_rename_var_uses(ssa, ssa_op->op1_def, op1_new, true);
-								ssa->vars[ssa_op->op1_def].definition = -1;
-								ssa_op->op1_def = -1;
+								zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
 							}
-							//ZEND_ASSERT(ssa_op->op1_def < 0);
+
 							zend_ssa_unlink_use_chain(ssa, op_num, ssa_op->op1_use);
 							ssa_op->op1_use = -1;
 							ssa_op->op1_use_chain = -1;
@@ -1088,13 +1083,13 @@ static void zend_dfa_optimize_send_copies(zend_op_array *op_array, zend_ssa *ssa
 			continue;
 		}
 
-		zend_ssa_op *this_ssa_op = ssa->ops + i;
-		int op1_def = this_ssa_op->op1_def;
+		zend_ssa_op *ssa_op = ssa->ops + i;
+		int op1_def = ssa_op->op1_def;
 		if (op1_def == -1) {
 			continue;
 		}
 
-		int ssa_cv = this_ssa_op->op1_use;
+		int ssa_cv = ssa_op->op1_use;
 
 #if 0
 		/* Argument move must not be observable in backtraces */
@@ -1118,13 +1113,8 @@ static void zend_dfa_optimize_send_copies(zend_op_array *op_array, zend_ssa *ssa
 			/* Flag will be used by VM type spec handler */
 			op_array->opcodes[i].extended_value = 1;
 			//fprintf(stderr, "optimized\n");
-		} else {
-			/* TODO: move to somewhere common */
-			int op1_new = this_ssa_op->op1_use;
-			/* zend_ssa_rename_var_uses() clear use_chain & phi_use_chain for us */
-			zend_ssa_rename_var_uses(ssa, this_ssa_op->op1_def, op1_new, true);
-			ssa->vars[this_ssa_op->op1_def].definition = -1;
-			this_ssa_op->op1_def = -1;
+		} else if (opline->opcode == ZEND_SEND_VAR) {
+			zend_ssa_replace_op1_def_op1_use(ssa, ssa_op);
 		}
 	}
 }

Zend/Optimizer/sccp.c

@@ -2045,13 +2045,8 @@ static int remove_call(sccp_ctx *ctx, zend_op *opline, zend_ssa_op *ssa_op)
 		zend_op *op = call->arg_info[i].opline;
 		zend_ssa_op *this_ssa_op = &ssa->ops[op - op_array->opcodes];
 
-		/* TODO: move this code to somewhere common */
 		if (op->opcode == ZEND_SEND_VAR && this_ssa_op->op1_def >= 0) {
-			int op1_new = this_ssa_op->op1_use;
-			/* zend_ssa_rename_var_uses() clear use_chain & phi_use_chain for us */
-			zend_ssa_rename_var_uses(ssa, this_ssa_op->op1_def, op1_new, true);
-			ssa->vars[this_ssa_op->op1_def].definition = -1;
-			this_ssa_op->op1_def = -1;
+			zend_ssa_replace_op1_def_op1_use(ssa, this_ssa_op);
 		}
 
 		zend_ssa_remove_instr(ssa, op, this_ssa_op);

Zend/Optimizer/zend_ssa.c

@@ -1680,3 +1680,13 @@ void zend_ssa_rename_var_uses(zend_ssa *ssa, int old, int new, bool update_types
 	old_var->phi_use_chain = NULL;
 }
 /* }}} */
+
+void zend_ssa_replace_op1_def_op1_use(zend_ssa *ssa, zend_ssa_op *ssa_op)
+{
+	int op1_new = ssa_op->op1_use;
+	ZEND_ASSERT(op1_new >= 0);
+	ZEND_ASSERT(ssa_op->op1_def >= 0);
+	/* zend_ssa_rename_var_uses() clear use_chain & phi_use_chain for us */
+	zend_ssa_rename_var_uses(ssa, ssa_op->op1_def, op1_new, true);
+	zend_ssa_remove_op1_def(ssa, ssa_op);
+}

Zend/Optimizer/zend_ssa.h

@@ -159,6 +159,7 @@ void zend_ssa_remove_uses_of_var(zend_ssa *ssa, int var_num);
 void zend_ssa_remove_block(zend_op_array *op_array, zend_ssa *ssa, int b);
 void zend_ssa_rename_var_uses(zend_ssa *ssa, int old_var, int new_var, bool update_types);
 void zend_ssa_remove_block_from_cfg(zend_ssa *ssa, int b);
+void zend_ssa_replace_op1_def_op1_use(zend_ssa *ssa, zend_ssa_op *ssa_op);
 
 static zend_always_inline void _zend_ssa_remove_def(zend_ssa_var *var)
 {