Mesa (master): nv50: fix bad assertion on Elements(phi->src) in regalloc

Christoph Bumiller chrisbmr at kemper.freedesktop.org
Mon Feb 6 11:20:19 UTC 2012


Module: Mesa
Branch: master
Commit: 189e6c7e81ce35b89d9b52d4bd0d6271a7e9c10f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=189e6c7e81ce35b89d9b52d4bd0d6271a7e9c10f

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Mon Feb  6 12:15:17 2012 +0100

nv50: fix bad assertion on Elements(phi->src) in regalloc

The array is phi->src, phi->src[i] is just a pointer.

---

 src/gallium/drivers/nv50/nv50_pc_regalloc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_pc_regalloc.c b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
index 72922cb..12a59cb 100644
--- a/src/gallium/drivers/nv50/nv50_pc_regalloc.c
+++ b/src/gallium/drivers/nv50/nv50_pc_regalloc.c
@@ -421,7 +421,7 @@ phi_opnd_for_bb(struct nv_instruction *phi, struct nv_basic_block *b,
    int i, j;
 
    for (j = -1, i = 0; i < 6 && phi->src[i]; ++i) {
-      assert(i < Elements(phi->src[i]));
+      assert(i < Elements(phi->src));
       srci = phi->src[i];
       /* if already replaced, check with original source first */
       if (srci->flags & NV_REF_FLAG_REGALLOC_PRIV)




More information about the mesa-commit mailing list