Mesa (master): nvc0/ir: fix default insertion position in pre-SSA lowering pass

Christoph Bumiller chrisbmr at kemper.freedesktop.org
Mon Jan 9 23:44:30 UTC 2012


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

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Fri Jan  6 22:19:42 2012 +0100

nvc0/ir: fix default insertion position in pre-SSA lowering pass

Always set position to insert before the current instruction,
the previous behaviour led to confusion (bug in checkPredicate
for BBs with only a single conditional branch).

---

 .../drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
index 6faef9b..e4d32d0 100644
--- a/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nvc0/codegen/nv50_ir_lowering_nvc0.cpp
@@ -657,13 +657,7 @@ NVC0LoweringPass::checkPredicate(Instruction *insn)
 bool
 NVC0LoweringPass::visit(Instruction *i)
 {
-   if (i->prev)
-      bld.setPosition(i->prev, true);
-   else
-   if (i->next)
-      bld.setPosition(i->next, false);
-   else
-      bld.setPosition(i->bb, true);
+   bld.setPosition(i, false);
 
    if (i->cc != CC_ALWAYS)
       checkPredicate(i);




More information about the mesa-commit mailing list