From: Julian Seward <jseward@acm.org>
Date: Wed, 4 May 2011 09:09:31 +0000 (+0000)
Subject: mkLazyN: fix incorrect type decl for 'mergeTy64', as spotted by IBM's
X-Git-Tag: svn/VALGRIND_3_7_0~511
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed9d5664634a913f2c55d49ef2234019d62a7970;p=thirdparty%2Fvalgrind.git

mkLazyN: fix incorrect type decl for 'mergeTy64', as spotted by IBM's
BEAM checker.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11726
---

diff --git a/memcheck/mc_translate.c b/memcheck/mc_translate.c
index 5e0a1a8e04..3f027fcccf 100644
--- a/memcheck/mc_translate.c
+++ b/memcheck/mc_translate.c
@@ -1571,7 +1571,7 @@ IRAtom* mkLazyN ( MCEnv* mce,
    IRAtom* here;
    IRAtom* curr;
    IRType  mergeTy;
-   IRType  mergeTy64 = True;
+   Bool    mergeTy64 = True;
 
    /* Decide on the type of the merge intermediary.  If all relevant
       args are I64, then it's I64.  In all other circumstances, use