Skip to content

Commit 32672c7

Browse files
committed
---
yaml --- r: 271957 b: refs/heads/master c: 6935782 h: refs/heads/master i: 271955: f7fe801
1 parent 6cc5000 commit 32672c7

File tree

2 files changed

+54
-1
lines changed

2 files changed

+54
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 02cb1d4ef1e187494f7f089e114515dc74fabd10
2+
refs/heads/master: 6935782b07c1caf2cc78c44faf28cc4cf0658fe8
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
44
refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// This code produces a CFG with critical edges that, if we don't
12+
// handle properly, will cause invalid codegen.
13+
14+
#![feature(rustc_attrs)]
15+
16+
enum State {
17+
Both,
18+
Front,
19+
Back
20+
}
21+
22+
pub struct Foo<A: Iterator, B: Iterator> {
23+
state: State,
24+
a: A,
25+
b: B
26+
}
27+
28+
impl<A, B> Foo<A, B>
29+
where A: Iterator, B: Iterator<Item=A::Item>
30+
{
31+
// This is the function we care about
32+
#[rustc_mir]
33+
fn next(&mut self) -> Option<A::Item> {
34+
match self.state {
35+
State::Both => match self.a.next() {
36+
elt @ Some(..) => elt,
37+
None => {
38+
self.state = State::Back;
39+
self.b.next()
40+
}
41+
},
42+
State::Front => self.a.next(),
43+
State::Back => self.b.next(),
44+
}
45+
}
46+
}
47+
48+
// Make sure we actually translate a version of the function
49+
pub fn do_stuff(mut f: Foo<Box<Iterator<Item=u32>>, Box<Iterator<Item=u32>>>) {
50+
let _x = f.next();
51+
}
52+
53+
fn main() {}

0 commit comments

Comments
 (0)