From 0c7c0b197f96d2ca8bd0b3c654dab783047ecb94 Mon Sep 17 00:00:00 2001
From: Ally Donaldson <unknown>
Date: Wed, 6 Nov 2013 21:07:32 +0000
Subject: Fixes to predication.  Patch by Jeroen Ketema.

---
 Source/Predication/SmartBlockPredicator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Predication')

diff --git a/Source/Predication/SmartBlockPredicator.cs b/Source/Predication/SmartBlockPredicator.cs
index 5222061f..ea526591 100644
--- a/Source/Predication/SmartBlockPredicator.cs
+++ b/Source/Predication/SmartBlockPredicator.cs
@@ -429,7 +429,7 @@ public class SmartBlockPredicator {
     var oldCmdSeq = block.Cmds;
     block.Cmds = new List<Cmd>();
     newBlocks.Add(block);
-    if (prevBlock != null) {
+    if (prevBlock != null && !((prevBlock.TransferCmd is ReturnCmd) && uni != null && uni.IsUniform(impl.Name, block))) {
       prevBlock.TransferCmd = new GotoCmd(Token.NoToken, new List<Block> { block });
     }
 
-- 
cgit v1.2.3