From: Julian Seward <jseward@acm.org>
Date: Sun, 2 Sep 2012 13:47:56 +0000 (+0000)
Subject: Merge from trunk, r2469 (fix a mixup re Binop vs Unop)
X-Git-Tag: svn/VALGRIND_3_8_1^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9db4781e513a03d3ada0487f75aa1607ef059580;p=thirdparty%2Fvalgrind.git

Merge from trunk, r2469 (fix a mixup re Binop vs Unop)


git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_8_BRANCH@2500
---

diff --git a/VEX/priv/ir_defs.c b/VEX/priv/ir_defs.c
index 29f8b416f6..eb6bb41e4a 100644
--- a/VEX/priv/ir_defs.c
+++ b/VEX/priv/ir_defs.c
@@ -3459,7 +3459,7 @@ void tcExpr ( IRSB* bb, IRStmt* stmt, IRExpr* expr, IRType gWordTy )
       }
       case Iex_Unop:
          tcExpr(bb,stmt, expr->Iex.Unop.arg, gWordTy );
-         typeOfPrimop(expr->Iex.Binop.op, 
+         typeOfPrimop(expr->Iex.Unop.op, 
                       &t_dst, &t_arg1, &t_arg2, &t_arg3, &t_arg4);
          if (t_arg1 == Ity_INVALID || t_arg2 != Ity_INVALID
              || t_arg3 != Ity_INVALID || t_arg4 != Ity_INVALID)