From: Julian Seward <jseward@acm.org>
Date: Mon, 21 Mar 2005 01:06:20 +0000 (+0000)
Subject: The Icc typechecker police have been round banging on our doors again.
X-Git-Tag: svn/VALGRIND_3_0_1^2~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a861c9dd7898e98f0cea647255fcf8ffdea65fb5;p=thirdparty%2Fvalgrind.git

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 0e65d542d8..407e4e0836 100644
--- 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(