From: Florian Krohm <florian@eich-krohm.de>
Date: Thu, 24 Jan 2013 16:18:48 +0000 (+0000)
Subject: Fix HReg <--> UInt mixup.
X-Git-Tag: svn/VALGRIND_3_9_0^2~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07f4cd2e95cef80fe1826ffe420376627e6d1720;p=thirdparty%2Fvalgrind.git

Fix HReg <--> UInt mixup.
vreg is a HReg, so we should not assign a hregNumber() to it.
Introduce and use vregno instead.


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

diff --git a/VEX/priv/host_generic_reg_alloc2.c b/VEX/priv/host_generic_reg_alloc2.c
index b1bf586bda..a5e382b6a5 100644
--- a/VEX/priv/host_generic_reg_alloc2.c
+++ b/VEX/priv/host_generic_reg_alloc2.c
@@ -1087,9 +1087,9 @@ HInstrArray* doRegisterAllocation (
       for (j = 0; j < n_rregs; j++) {
          if (rreg_state[j].disp != Bound)
             continue;
-         vreg = hregNumber(rreg_state[j].vreg);
-         vassert(IS_VALID_VREGNO(vreg));
-         if (vreg_lrs[vreg].dead_before <= ii) {
+         UInt vregno = hregNumber(rreg_state[j].vreg);
+         vassert(IS_VALID_VREGNO(vregno));
+         if (vreg_lrs[vregno].dead_before <= ii) {
             rreg_state[j].disp = Free;
             rreg_state[j].eq_spill_slot = False;
             m = hregNumber(rreg_state[j].vreg);