[Mesa-stable] [PATCH] nv50/ir: we can't replace 0x0 with the zero reg for SHLADD

[Karol Herbst]

fixes a crash in Alien Isolation

Signed-off-by: Karol Herbst <karolherbst at gmail.com>
Cc: 13.0 17.0 17.1 <mesa-stable at lists.freedesktop.org>
---
 src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
index 732e1a93b4..4815d6df07 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
@@ -740,7 +740,7 @@ NVC0LegalizePostRA::visit(BasicBlock *bb)
                next = hi;
          }
 
-         if (i->op != OP_MOV && i->op != OP_PFETCH)
+         if (i->op != OP_MOV && i->op != OP_PFETCH && i->op != OP_SHLADD)
             replaceZero(i);
       }
    }
-- 
2.12.2