Skip to content

Commit 4a07be3

Browse files
authored
Rollup merge of rust-lang#39834 - cseale:feature-gate-static-recursion, r=est31
static recursion test added to compile-fail test suite Issue rust-lang#39059 r? @est31
2 parents 01ccaa3 + cf20d8e commit 4a07be3

File tree

2 files changed

+50
-1
lines changed

2 files changed

+50
-1
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
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+
static mut S: *const u8 = unsafe { &S as *const *const u8 as *const u8 };
12+
//~^ ERROR recursive static (see issue #29719)
13+
14+
struct StaticDoubleLinked {
15+
prev: &'static StaticDoubleLinked,
16+
next: &'static StaticDoubleLinked,
17+
data: i32,
18+
head: bool,
19+
}
20+
21+
static L1: StaticDoubleLinked = StaticDoubleLinked{prev: &L3, next: &L2, data: 1, head: true};
22+
//~^ ERROR recursive static (see issue #29719)
23+
//~^^ ERROR recursive static (see issue #29719)
24+
//~^^^ ERROR recursive static (see issue #29719)
25+
static L2: StaticDoubleLinked = StaticDoubleLinked{prev: &L1, next: &L3, data: 2, head: false};
26+
static L3: StaticDoubleLinked = StaticDoubleLinked{prev: &L2, next: &L1, data: 3, head: false};
27+
28+
29+
pub fn main() {
30+
unsafe { assert_eq!(S, *(S as *const *const u8)); }
31+
32+
let mut test_vec = Vec::new();
33+
let mut cur = &L1;
34+
loop {
35+
test_vec.push(cur.data);
36+
cur = cur.next;
37+
if cur.head { break }
38+
}
39+
assert_eq!(&test_vec, &[1,2,3]);
40+
41+
let mut test_vec = Vec::new();
42+
let mut cur = &L1;
43+
loop {
44+
cur = cur.prev;
45+
test_vec.push(cur.data);
46+
if cur.head { break }
47+
}
48+
assert_eq!(&test_vec, &[3,2,1]);
49+
}

src/tools/tidy/src/features.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ pub fn check(path: &Path, bad: &mut bool) {
166166

167167
// FIXME get this whitelist empty.
168168
let whitelist = vec![
169-
"abi_ptx", "simd", "static_recursion",
169+
"abi_ptx", "simd",
170170
"cfg_target_has_atomic",
171171
"unboxed_closures", "stmt_expr_attributes",
172172
"cfg_target_thread_local", "unwind_attributes",

0 commit comments

Comments
 (0)