Testing

Author: nielsdos

Zend/Optimizer/dfa_pass.c

@@ -466,7 +466,13 @@ int zend_dfa_optimize_calls(zend_op_array *op_array, zend_ssa *ssa)
 							int var_num = ssa_op->op1_use;
 							zend_ssa_var *var = ssa->vars + var_num;
 
-							ZEND_ASSERT(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_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;
@@ -1080,12 +1086,13 @@ static void zend_dfa_optimize_send_copies(zend_op_array *op_array, zend_ssa *ssa
 			continue;
 		}
 
-		int op1_def = ssa->ops[i].op1_def;
+		zend_ssa_op *this_ssa_op = ssa->ops + i;
+		int op1_def = this_ssa_op->op1_def;
 		if (op1_def == -1) {
 			continue;
 		}
 
-		int ssa_cv = ssa->ops[i].op1_use;
+		int ssa_cv = this_ssa_op->op1_use;
 
 #if 0
 		/* Argument move must not be observable in backtraces */
@@ -1105,10 +1112,17 @@ static void zend_dfa_optimize_send_copies(zend_op_array *op_array, zend_ssa *ssa
 
 		/* 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/* && ssa_var->use_chain >= 0*/) {
 			/* 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;
 		}
 	}
 }

Zend/Optimizer/sccp.c

@@ -2045,6 +2045,7 @@ 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 */