X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=03c707be0f1ab0e31fba994cffc973c7f709b7e8;hb=45dfabd3acda895e53c27e4e5095fc8caa945a56;hp=29d19901adc45a6c8f16d3b04142164c801dafb3;hpb=896321f0a34f3aed88c02b159d056ef7afc2ce41;p=libfirm

diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index 29d19901a..03c707be0 100644
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -4816,7 +4816,7 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) {
 	ir_node *new_and, *new_const, *block;
 	ir_mode *mode = get_irn_mode(or);
 
-	tarval *tv1, *tv2, *tv3, *tv4, *tv, *n_tv4, *n_tv2;
+	tarval *tv1, *tv2, *tv3, *tv4, *tv;
 
 	while (1) {
 		get_comm_Binop_Ops(or, &and, &c1);
@@ -4865,14 +4865,12 @@ static ir_node *transform_node_Or_bf_store(ir_node *or) {
 			return or;
 		}
 
-		n_tv4 = tarval_not(tv4);
-		if (tv3 != tarval_and(tv3, n_tv4)) {
+		if (tv3 != tarval_andnot(tv3, tv4)) {
 			/* bit in the or_mask is outside the and_mask */
 			return or;
 		}
 
-		n_tv2 = tarval_not(tv2);
-		if (tv1 != tarval_and(tv1, n_tv2)) {
+		if (tv1 != tarval_andnot(tv1, tv2)) {
 			/* bit in the or_mask is outside the and_mask */
 			return or;
 		}
@@ -6358,22 +6356,22 @@ static void update_known_irn(ir_node *known_irn, const ir_node *new_ir_node) {
  *         node could be found
  */
 ir_node *identify_remember(pset *value_table, ir_node *n) {
-	ir_node *o = NULL;
+	ir_node *nn = NULL;
 
 	if (!value_table) return n;
 
 	ir_normalize_node(n);
 	/* lookup or insert in hash table with given hash key. */
-	o = pset_insert(value_table, n, ir_node_hash(n));
+	nn = pset_insert(value_table, n, ir_node_hash(n));
 
-	if (o != n) {
-		update_known_irn(o, n);
+	if (nn != n) {
+		update_known_irn(nn, n);
 
 		/* n is reachable again */
-		edges_node_revival(n, get_irn_irg(n));
+		edges_node_revival(nn, get_irn_irg(nn));
 	}
 
-	return o;
+	return nn;
 }  /* identify_remember */
 
 /**