The Icc typechecker police have been round banging on our doors again.

Placating icc -Wall is a Herculean task; I don't know if it will ever
get completed.

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

diff --git a/VEX/priv/ir/iropt.c b/VEX/priv/ir/iropt.c
index 0e65d542d88f000622116a382730c60eedbb6162..407e4e0836d2a7e4d6c9914c8755a99fdf139a2a 100644 (file)
--- a/VEX/priv/ir/iropt.c
+++ b/VEX/priv/ir/iropt.c
@@ -986,9 +986,9 @@ static IRExpr* fold_Expr ( IRExpr* e )
                         ^ e->Iex.Binop.arg2->Iex.Const.con->Ico.U8))));
                break;
             case Iop_Xor16:
-               e2 = IRExpr_Const(IRConst_U16(
+               e2 = IRExpr_Const(IRConst_U16(toUShort(
                        (e->Iex.Binop.arg1->Iex.Const.con->Ico.U16
-                        ^ e->Iex.Binop.arg2->Iex.Const.con->Ico.U16)));
+                        ^ e->Iex.Binop.arg2->Iex.Const.con->Ico.U16))));
                break;
             case Iop_Xor32:
                e2 = IRExpr_Const(IRConst_U32(