Tweak

Author: ndossche

Zend/Optimizer/dfa_pass.c

@@ -1131,14 +1131,6 @@ 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;
@@ -1179,6 +1171,14 @@ 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,12 +1053,7 @@ 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) {
-				if (opline->extended_value) {
-					ZVAL_UNDEF(&zv);
-					SET_RESULT(op1, &zv);
-				} else {
-					SET_RESULT(op1, op1);
-				}
+				SET_RESULT(op1, op1);
 			}
 
 			/* If the value of a SEND for an ICALL changes, we need to reconsider the