Merge from trunk, r2086 (Get rid of unintended complex integral constant)

git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_6_BRANCH@2100

diff --git a/VEX/priv/guest_arm_toIR.c b/VEX/priv/guest_arm_toIR.c
index c1f92111f6f4a3749b85bc6f31920e33aed4d4c6..da65d8c3ec95483916fc4d228d9a23c7137d2697 100644 (file)
--- a/VEX/priv/guest_arm_toIR.c
+++ b/VEX/priv/guest_arm_toIR.c
@@ -10985,7 +10985,7 @@ static Bool decode_CP10_CP11_instruction (
       UInt rT   = INSN(15,12);
       UInt Q    = INSN(21,21);
       UInt size = (INSN(22,22) << 1) | INSN(5,5);
-      if (rT == 15 || (isT && rT == 13) || size == 3i || (Q && (rD & 1))) {
+      if (rT == 15 || (isT && rT == 13) || size == 3 || (Q && (rD & 1))) {
          /* fall through */
       } else {
          IRExpr* e = isT ? getIRegT(rT) : getIRegA(rT);