Constant folding: do And8/16/32(t,t) ==> t, for some IRTemp t

git-svn-id: svn://svn.valgrind.org/vex/trunk@208

diff --git a/VEX/priv/ir/iropt.c b/VEX/priv/ir/iropt.c
index 27cc370d3e5dee3a70ef33e09b53b96c06cefc03..de2d3bba15af7bc2683b8701f26813429f91cdd6 100644 (file)
--- a/VEX/priv/ir/iropt.c
+++ b/VEX/priv/ir/iropt.c
@@ -298,6 +298,14 @@ static IRBB* flatten_BB ( IRBB* in )
 /*--- Constant propagation and folding                        ---*/
 /*---------------------------------------------------------------*/
 
+/* Are both expressions simply the same IRTemp ? */
+static Bool sameIRTemps ( IRExpr* e1, IRExpr* e2 )
+{
+   return e1->tag == Iex_Tmp
+          && e2->tag == Iex_Tmp
+          && e1->Iex.Tmp.tmp == e2->Iex.Tmp.tmp;
+}
+
 static IRExpr* fold_Expr ( IRExpr* e )
 {
    Int     shift;
@@ -407,13 +415,25 @@ static IRExpr* fold_Expr ( IRExpr* e )
            default:
               goto unhandled;
          }
+
       } else {
+
          /* other cases (identities, etc) */
+         /* Add32(x,0) ==> x */
          if (e->Iex.Binop.op == Iop_Add32
              && e->Iex.Binop.arg2->tag == Iex_Const
              && e->Iex.Binop.arg2->Iex.Const.con->Ico.U32 == 0) {
             e2 = e->Iex.Binop.arg1;
-         }
+         } else
+
+         /* And8/16/32(t,t) ==> t, for some IRTemp t */
+         if ((e->Iex.Binop.op == Iop_And32
+              || e->Iex.Binop.op == Iop_And16
+              || e->Iex.Binop.op == Iop_And8)
+             && sameIRTemps(e->Iex.Binop.arg1, e->Iex.Binop.arg2)) {
+            e2 = e->Iex.Binop.arg1;
+        }
+
       }
    }