---

nikomatsakis · nikomatsakis · commit ce352c78b406 · 2013-04-30T14:07:26.000-04:00
yaml --- r: 140223 b: refs/heads/try2 c: aa48a17 h: refs/heads/master i: 140221: d892902 140219: 323e779 140215: 9a98eff 140207: c36693a 140191: ac37c7e 140159: 8831bdf v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a896440ca1b93cc5dc6edd827ea2ae89602bfa9e
+refs/heads/try2: aa48a170d55e3003b70626b16ccd698b5aca8269
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustc/middle/dataflow.rs b/branches/try2/src/librustc/middle/dataflow.rs
@@ -846,10 +846,9 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {
         // alternatives, so we must treat this like an N-way select
         // statement.
         let initial_state = reslice(in_out).to_vec();
-        self.reset(in_out);
         for pats.each |&pat| {
             let mut temp = copy initial_state;
-            self.walk_pat(pat, in_out, loop_scopes);
+            self.walk_pat(pat, temp, loop_scopes);
             join_bits(&self.dfcx.oper, temp, in_out);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -846,10 +846,9 @@ impl<'self, O:DataFlowOperator> PropagationContext<'self, O> {`
`846`	`846`	`// alternatives, so we must treat this like an N-way select`
`847`	`847`	`// statement.`
`848`	`848`	`let initial_state = reslice(in_out).to_vec();`
`849`		`- self.reset(in_out);`
`850`	`849`	`for pats.each \|&pat\| {`
`851`	`850`	`let mut temp = copy initial_state;`
`852`		`- self.walk_pat(pat, in_out, loop_scopes);`
	`851`	`+ self.walk_pat(pat, temp, loop_scopes);`
`853`	`852`	`join_bits(&self.dfcx.oper, temp, in_out);`
`854`	`853`	`}`
`855`	`854`	`}`