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 b1bf586bda572714ddd2455c059451fe0e554814..a5e382b6a538c5e7c543de6e611c125a54ba6483 100644 (file)
--- 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);