Skip to content

Commit aadbcff

Browse files
petrochenkovpetrochenkov
committed
Issue deprecation warnings for safe accesses to extern statics
1 parent ea45edf commit aadbcff

File tree

11 files changed

+123
-16
lines changed

11 files changed

+123
-16
lines changed

‎src/doc/book/ffi.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ extern {
471471
472472
fn main() {
473473
println!("You have readline version {} installed.",
474-
rl_readline_version as i32);
474+
unsafe { rl_readline_version as i32 });
475475
}
476476
```
477477

‎src/libpanic_unwind/seh.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,13 @@ extern "C" {
232232
// Again, I'm not entirely sure what this is describing, it just seems to work.
233233
#[cfg_attr(not(test), lang = "msvc_try_filter")]
234234
static mut TYPE_DESCRIPTOR1: _TypeDescriptor = _TypeDescriptor {
235-
pVFTable: &TYPE_INFO_VTABLE as *const _ as *const _,
235+
pVFTable: unsafe { &TYPE_INFO_VTABLE } as *const _ as *const _,
236236
spare: 0 as *mut _,
237237
name: imp::NAME1,
238238
};
239239

240240
static mut TYPE_DESCRIPTOR2: _TypeDescriptor = _TypeDescriptor {
241-
pVFTable: &TYPE_INFO_VTABLE as *const _ as *const _,
241+
pVFTable: unsafe { &TYPE_INFO_VTABLE } as *const _ as *const _,
242242
spare: 0 as *mut _,
243243
name: imp::NAME2,
244244
};

‎src/librustc/lint/builtin.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,12 @@ declare_lint! {
192192
"lifetimes or labels named `'_` were erroneously allowed"
193193
}
194194

195+
declare_lint! {
196+
pub SAFE_EXTERN_STATICS,
197+
Warn,
198+
"safe access to extern statics was erroneously allowed"
199+
}
200+
195201
/// Does nothing as a lint pass, but registers some `Lint`s
196202
/// which are used by other parts of the compiler.
197203
#[derive(Copy, Clone)]
@@ -228,7 +234,8 @@ impl LintPass for HardwiredLints {
228234
RENAMED_AND_REMOVED_LINTS,
229235
SUPER_OR_SELF_IN_GLOBAL_PATH,
230236
HR_LIFETIME_IN_ASSOC_TYPE,
231-
LIFETIME_UNDERSCORE
237+
LIFETIME_UNDERSCORE,
238+
SAFE_EXTERN_STATICS
232239
)
233240
}
234241
}

‎src/librustc/middle/effect.rs

+31-9
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use self::RootUnsafeContext::*;
1515
use dep_graph::DepNode;
1616
use ty::{self, Ty, TyCtxt};
1717
use ty::MethodCall;
18+
use lint;
1819

1920
use syntax::ast;
2021
use syntax_pos::Span;
@@ -57,16 +58,25 @@ struct EffectCheckVisitor<'a, 'tcx: 'a> {
5758
}
5859

5960
impl<'a, 'tcx> EffectCheckVisitor<'a, 'tcx> {
60-
fn require_unsafe(&mut self, span: Span, description: &str) {
61+
fn require_unsafe_ext(&mut self, node_id: ast::NodeId, span: Span,
62+
description: &str, is_lint: bool) {
6163
if self.unsafe_context.push_unsafe_count > 0 { return; }
6264
match self.unsafe_context.root {
6365
SafeContext => {
64-
// Report an error.
65-
struct_span_err!(
66-
self.tcx.sess, span, E0133,
67-
"{} requires unsafe function or block", description)
68-
.span_label(span, &description)
69-
.emit();
66+
if is_lint {
67+
self.tcx.sess.add_lint(lint::builtin::SAFE_EXTERN_STATICS,
68+
node_id,
69+
span,
70+
format!("{} requires unsafe function or \
71+
block (error E0133)", description));
72+
} else {
73+
// Report an error.
74+
struct_span_err!(
75+
self.tcx.sess, span, E0133,
76+
"{} requires unsafe function or block", description)
77+
.span_label(span, &description)
78+
.emit();
79+
}
7080
}
7181
UnsafeBlock(block_id) => {
7282
// OK, but record this.
@@ -76,6 +86,10 @@ impl<'a, 'tcx> EffectCheckVisitor<'a, 'tcx> {
7686
UnsafeFn => {}
7787
}
7888
}
89+
90+
fn require_unsafe(&mut self, span: Span, description: &str) {
91+
self.require_unsafe_ext(ast::DUMMY_NODE_ID, span, description, false)
92+
}
7993
}
8094

8195
impl<'a, 'tcx, 'v> Visitor<'v> for EffectCheckVisitor<'a, 'tcx> {
@@ -173,8 +187,16 @@ impl<'a, 'tcx, 'v> Visitor<'v> for EffectCheckVisitor<'a, 'tcx> {
173187
self.require_unsafe(expr.span, "use of inline assembly");
174188
}
175189
hir::ExprPath(..) => {
176-
if let Def::Static(_, true) = self.tcx.expect_def(expr.id) {
177-
self.require_unsafe(expr.span, "use of mutable static");
190+
if let Def::Static(def_id, mutbl) = self.tcx.expect_def(expr.id) {
191+
if mutbl {
192+
self.require_unsafe(expr.span, "use of mutable static");
193+
} else if match self.tcx.map.get_if_local(def_id) {
194+
Some(hir::map::NodeForeignItem(..)) => true,
195+
Some(..) => false,
196+
None => self.tcx.sess.cstore.is_foreign_item(def_id),
197+
} {
198+
self.require_unsafe_ext(expr.id, expr.span, "use of extern static", true);
199+
}
178200
}
179201
}
180202
hir::ExprField(ref base_expr, field) => {

‎src/librustc_lint/lib.rs

+4
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,10 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) {
201201
id: LintId::of(LIFETIME_UNDERSCORE),
202202
reference: "RFC 1177 <https://github.com/rust-lang/rfcs/pull/1177>",
203203
},
204+
FutureIncompatibleInfo {
205+
id: LintId::of(SAFE_EXTERN_STATICS),
206+
reference: "issue 36247 <https://github.com/rust-lang/rust/issues/35112>",
207+
},
204208
]);
205209

206210
// Register renamed and removed lints

‎src/test/compile-fail/auxiliary/extern-statics.rs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2016 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+
extern {
12+
pub static XA: u8;
13+
pub static mut XB: u8;
14+
}

‎src/test/compile-fail/linkage2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ extern {
1616
}
1717

1818
fn main() {
19-
println!("{}", foo);
19+
println!("{}", unsafe { foo });
2020
}

‎src/test/compile-fail/linkage3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ extern {
1616
}
1717

1818
fn main() {
19-
println!("{:?}", foo);
19+
println!("{:?}", unsafe { foo });
2020
}

‎src/test/compile-fail/safe-extern-statics-mut.rs

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright 2016 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+
// aux-build:extern-statics.rs
12+
13+
#![allow(unused)]
14+
#![deny(safe_extern_statics)]
15+
16+
extern crate extern_statics;
17+
use extern_statics::*;
18+
19+
extern {
20+
static mut B: u8;
21+
}
22+
23+
fn main() {
24+
let b = B; //~ ERROR use of mutable static requires unsafe function or block
25+
let rb = &B; //~ ERROR use of mutable static requires unsafe function or block
26+
let xb = XB; //~ ERROR use of mutable static requires unsafe function or block
27+
let xrb = &XB; //~ ERROR use of mutable static requires unsafe function or block
28+
}

‎src/test/compile-fail/safe-extern-statics.rs

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright 2016 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+
// aux-build:extern-statics.rs
12+
13+
#![allow(unused)]
14+
#![deny(safe_extern_statics)]
15+
16+
extern crate extern_statics;
17+
use extern_statics::*;
18+
19+
extern {
20+
static A: u8;
21+
}
22+
23+
fn main() {
24+
let a = A; //~ ERROR use of extern static requires unsafe function or block
25+
//~^ WARN this was previously accepted by the compiler
26+
let ra = &A; //~ ERROR use of extern static requires unsafe function or block
27+
//~^ WARN this was previously accepted by the compiler
28+
let xa = XA; //~ ERROR use of extern static requires unsafe function or block
29+
//~^ WARN this was previously accepted by the compiler
30+
let xra = &XA; //~ ERROR use of extern static requires unsafe function or block
31+
//~^ WARN this was previously accepted by the compiler
32+
}

‎src/test/run-pass/check-static-recursion-foreign.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ extern "C" {
2727
static test_static: c_int;
2828
}
2929

30-
static B: &'static c_int = &test_static;
30+
static B: &'static c_int = unsafe { &test_static };
3131

3232
pub fn main() {}

0 commit comments

Comments
 (0)