X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=230023eda0fb307485f48eaef2bc1ad1c3deceb0;hb=8974b94349462d835b33ad4f896d1821986458bd;hp=587b517968f6cb32d7d993f15c1df024c45ae2fb;hpb=6dbd1ecaf71f44f9883c9d5ac88ed19713d6f757;p=libfirm

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 587b51796..230023eda 100644
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -620,7 +620,8 @@ static void gen_assure_different_pattern(ir_node *irn, ir_node *other_different,
  */
 static void assure_different_constraints(ir_node *irn, constraint_env_t *env) {
 	const arch_register_req_t *req;
-	const arch_env_t          *arch_env = be_get_birg_arch_env(env->birg);
+	const arch_env_t          *arch_env    = be_get_birg_arch_env(env->birg);
+	ir_node                   *skipped_irn = belower_skip_proj(irn);
 
 	req = arch_get_register_req(arch_env, irn, -1);
 
@@ -639,14 +640,14 @@ static void assure_different_constraints(ir_node *irn, constraint_env_t *env) {
 				 * We can safely ignore a should_be_same x must_be_different y
 				 * IFF both inputs are equal!
 				 */
-				if (get_irn_n(irn, idx_other) == get_irn_n(irn, idx_same)) {
+				if (get_irn_n(skipped_irn, idx_other) == get_irn_n(skipped_irn, idx_same)) {
 					return;
 				}
 			}
 		}
 		for (i = 0; 1U << i <= other; ++i) {
 			if (other & (1U << i)) {
-				ir_node *different_from = get_irn_n(belower_skip_proj(irn), i);
+				ir_node *different_from = get_irn_n(skipped_irn, i);
 				gen_assure_different_pattern(irn, different_from, env);
 			}
 		}
@@ -921,9 +922,9 @@ static int push_through_perm(ir_node *perm, void *data)
 	sched_foreach_reverse_from (sched_prev(perm), irn) {
 		for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
 			ir_node *op = get_irn_n(irn, i);
-			if (arch_irn_consider_in_reg_alloc(aenv, cls, op)
-				&& !values_interfere(env->birg, op, one_proj)) {
-				frontier = sched_next(irn);
+			if (arch_irn_consider_in_reg_alloc(aenv, cls, op) &&
+			    !values_interfere(env->birg, op, one_proj)) {
+				frontier = irn;
 				goto found_front;
 			}
 		}