about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrian Anderson <andersrb@gmail.com>2011-04-02 18:47:39 -0400
committerBrian Anderson <andersrb@gmail.com>2011-04-02 20:35:50 -0400
commit203e33b611f56b3220ecafcbb82fa15c4de0e2b7 (patch)
tree6b3fa12d3139a059966b8010f1135db87dce34b5
parent6e6acaa39a2d6e7491ef282e6ca0f6b4db808321 (diff)
downloadrust-203e33b611f56b3220ecafcbb82fa15c4de0e2b7.tar.gz
rust-203e33b611f56b3220ecafcbb82fa15c4de0e2b7.zip
Make join_results branch into the join block even when only one edge is live.
I don't don't totally understand the implications of this but it makes the
behavior consistent for all live edges, which is going to make joining the
arms of an alt expression work correctly.
-rw-r--r--src/comp/middle/trans.rs6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/comp/middle/trans.rs b/src/comp/middle/trans.rs
index b16acfd9d4c..f297d329282 100644
--- a/src/comp/middle/trans.rs
+++ b/src/comp/middle/trans.rs
@@ -3045,12 +3045,6 @@ fn join_results(@block_ctxt parent_cx,
             ret ins.(0);
         }
 
-        case (1u) {
-            // Only one incoming edge is live, so we just feed that block
-            // onward.
-            ret live.(0);
-        }
-
         case (_) { /* fall through */ }
     }