From bbff98549d2c29b050ea1b867c226ec09c9d78f5 Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Wed, 25 May 2016 17:51:17 -0700
Subject: fix a merge-blocks bug where we merged named blocks

---
 src/passes/MergeBlocks.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/passes/MergeBlocks.cpp b/src/passes/MergeBlocks.cpp
index 5794e1379..7b9723b0b 100644
--- a/src/passes/MergeBlocks.cpp
+++ b/src/passes/MergeBlocks.cpp
@@ -100,7 +100,7 @@ struct MergeBlocks : public WalkerPass<PostWalker<MergeBlocks, Visitor<MergeBloc
     if (dependency1 && *dependency1 && EffectAnalyzer(*dependency1).hasSideEffects()) return outer;
     if (dependency2 && *dependency2 && EffectAnalyzer(*dependency2).hasSideEffects()) return outer;
     if (auto* block = child->dynCast<Block>()) {
-      if (block->list.size() >= 2) {
+      if (!block->name.is() && block->list.size() >= 2) {
         child = block->list.back();
         if (outer == nullptr) {
           // reuse the block, move it out
-- 
cgit v1.2.3