diff --git a/src/gallium/drivers/r600/sfn/sfn_liverangeevaluator.cpp b/src/gallium/drivers/r600/sfn/sfn_liverangeevaluator.cpp
index f551aaa4229..13e2955fa19 100644
--- a/src/gallium/drivers/r600/sfn/sfn_liverangeevaluator.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_liverangeevaluator.cpp
@@ -389,8 +389,11 @@ LiveRangeInstrVisitor::visit(ControlFlowInstr *instr)
 void
 LiveRangeInstrVisitor::visit(IfInstr *instr)
 {
+   int b = m_block;
+   m_block = -1;
    instr->predicate()->accept(*this);
    scope_if();
+   m_block = b;
 }
 
 void