Skip to content

Commit 4428a05

Browse files
borsbors
committed
Auto merge of rust-lang#129759 - dingxiangfei2009:stabilize-const-refs-to-static, r=RalfJung
Stabilize `const_refs_to_static` Meanwhile, I am cooking a sub-section in the language reference.
2 parents f2becdf + 1576a6d commit 4428a05

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+157
-442
lines changed

Diff for: ‎compiler/rustc_const_eval/src/check_consts/check.rs

-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ impl<'mir, 'tcx> Checker<'mir, 'tcx> {
317317
{
318318
self.error_emitted = Some(guar);
319319
}
320-
self.check_op_spanned(ops::StaticAccess, span)
321320
}
322321

323322
/// Returns whether this place can possibly escape the evaluation of the current const/static

Diff for: ‎compiler/rustc_const_eval/src/check_consts/ops.rs

-28
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use rustc_middle::ty::{
1616
suggest_constraining_type_param,
1717
};
1818
use rustc_middle::util::{CallDesugaringKind, CallKind, call_kind};
19-
use rustc_session::parse::feature_err;
2019
use rustc_span::symbol::sym;
2120
use rustc_span::{BytePos, Pos, Span, Symbol};
2221
use rustc_trait_selection::traits::SelectionContext;
@@ -477,33 +476,6 @@ impl<'tcx> NonConstOp<'tcx> for RawPtrToIntCast {
477476
}
478477
}
479478

480-
/// An access to a (non-thread-local) `static`.
481-
#[derive(Debug)]
482-
pub(crate) struct StaticAccess;
483-
impl<'tcx> NonConstOp<'tcx> for StaticAccess {
484-
fn status_in_item(&self, ccx: &ConstCx<'_, 'tcx>) -> Status {
485-
if let hir::ConstContext::Static(_) = ccx.const_kind() {
486-
Status::Allowed
487-
} else {
488-
Status::Unstable(sym::const_refs_to_static)
489-
}
490-
}
491-
492-
#[allow(rustc::untranslatable_diagnostic)] // FIXME: make this translatable
493-
fn build_error(&self, ccx: &ConstCx<'_, 'tcx>, span: Span) -> Diag<'tcx> {
494-
let mut err = feature_err(
495-
&ccx.tcx.sess,
496-
sym::const_refs_to_static,
497-
span,
498-
format!("referencing statics in {}s is unstable", ccx.const_kind(),),
499-
);
500-
err
501-
.note("`static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.")
502-
.help("to fix this, the value can be extracted to a `const` and then used.");
503-
err
504-
}
505-
}
506-
507479
/// An access to a thread-local `static`.
508480
#[derive(Debug)]
509481
pub(crate) struct ThreadLocalAccess;

Diff for: ‎compiler/rustc_error_codes/src/error_codes/E0013.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ variable cannot refer to a static variable.
55

66
Erroneous code example:
77

8-
```compile_fail,E0658
8+
```
99
static X: i32 = 42;
1010
const Y: i32 = X;
1111
```

Diff for: ‎compiler/rustc_feature/src/accepted.rs

+2
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ declare_features! (
151151
(accepted, const_raw_ptr_deref, "1.58.0", Some(51911)),
152152
/// Allows references to types with interior mutability within constants
153153
(accepted, const_refs_to_cell, "CURRENT_RUSTC_VERSION", Some(80384)),
154+
/// Allows creating pointers and references to `static` items in constants.
155+
(accepted, const_refs_to_static, "CURRENT_RUSTC_VERSION", Some(119618)),
154156
/// Allows implementing `Copy` for closures where possible (RFC 2132).
155157
(accepted, copy_closures, "1.26.0", Some(44490)),
156158
/// Allows `crate` in paths.

Diff for: ‎compiler/rustc_feature/src/unstable.rs

-2
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,6 @@ declare_features! (
407407
(unstable, const_for, "1.56.0", Some(87575)),
408408
/// Be more precise when looking for live drops in a const context.
409409
(unstable, const_precise_live_drops, "1.46.0", Some(73255)),
410-
/// Allows creating pointers and references to `static` items in constants.
411-
(unstable, const_refs_to_static, "1.78.0", Some(119618)),
412410
/// Allows `impl const Trait for T` syntax.
413411
(unstable, const_trait_impl, "1.42.0", Some(67792)),
414412
/// Allows the `?` operator in const contexts.

Diff for: ‎src/tools/tidy/src/issues.txt

-2
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,6 @@ ui/consts/issue-46553.rs
764764
ui/consts/issue-47789.rs
765765
ui/consts/issue-50439.rs
766766
ui/consts/issue-52023-array-size-pointer-cast.rs
767-
ui/consts/issue-52060.rs
768767
ui/consts/issue-54224.rs
769768
ui/consts/issue-54348.rs
770769
ui/consts/issue-54387.rs
@@ -3830,7 +3829,6 @@ ui/stability-attribute/issue-28388-3.rs
38303829
ui/stability-attribute/issue-99286-stable-intrinsics.rs
38313830
ui/static/auxiliary/issue_24843.rs
38323831
ui/static/issue-1660.rs
3833-
ui/static/issue-18118-2.rs
38343832
ui/static/issue-18118.rs
38353833
ui/static/issue-24446.rs
38363834
ui/static/issue-24843.rs

Diff for: ‎tests/ui/asm/aarch64/type-check-4.rs

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
//@ only-aarch64
2-
//@ compile-flags: -C target-feature=+neon
2+
//@ build-fail
33

4-
#![feature(repr_simd)]
5-
6-
use std::arch::aarch64::float64x2_t;
7-
use std::arch::{asm, global_asm};
8-
9-
#[repr(simd)]
10-
#[derive(Copy, Clone)]
11-
struct Simd256bit([f64; 4]);
4+
use std::arch::global_asm;
125

136
fn main() {}
147

158
// Constants must be... constant
169

17-
static S: i32 = 1;
10+
static mut S: i32 = 1;
1811
const fn const_foo(x: i32) -> i32 {
1912
x
2013
}
2114
const fn const_bar<T>(x: T) -> T {
2215
x
2316
}
24-
global_asm!("{}", const S);
25-
//~^ ERROR referencing statics
17+
global_asm!("{}", const unsafe { S });
18+
//~^ ERROR: evaluation of constant value failed
19+
//~| mutable global memory
2620
global_asm!("{}", const const_foo(0));
27-
global_asm!("{}", const const_foo(S));
28-
//~^ ERROR referencing statics
21+
global_asm!("{}", const const_foo(unsafe { S }));
22+
//~^ ERROR: evaluation of constant value failed
23+
//~| mutable global memory
2924
global_asm!("{}", const const_bar(0));
30-
global_asm!("{}", const const_bar(S));
31-
//~^ ERROR referencing statics
25+
global_asm!("{}", const const_bar(unsafe { S }));
26+
//~^ ERROR: evaluation of constant value failed
27+
//~| mutable global memory

Diff for: ‎tests/ui/asm/aarch64/type-check-4.stderr

+13-31
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,21 @@
1-
error[E0658]: referencing statics in constants is unstable
2-
--> $DIR/type-check-4.rs:24:25
1+
error[E0080]: evaluation of constant value failed
2+
--> $DIR/type-check-4.rs:17:34
33
|
4-
LL | global_asm!("{}", const S);
5-
| ^
6-
|
7-
= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
8-
= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
9-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
10-
= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
11-
= help: to fix this, the value can be extracted to a `const` and then used.
4+
LL | global_asm!("{}", const unsafe { S });
5+
| ^ constant accesses mutable global memory
126

13-
error[E0658]: referencing statics in constants is unstable
14-
--> $DIR/type-check-4.rs:27:35
15-
|
16-
LL | global_asm!("{}", const const_foo(S));
17-
| ^
7+
error[E0080]: evaluation of constant value failed
8+
--> $DIR/type-check-4.rs:21:44
189
|
19-
= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
20-
= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
21-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
22-
= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
23-
= help: to fix this, the value can be extracted to a `const` and then used.
10+
LL | global_asm!("{}", const const_foo(unsafe { S }));
11+
| ^ constant accesses mutable global memory
2412

25-
error[E0658]: referencing statics in constants is unstable
26-
--> $DIR/type-check-4.rs:30:35
27-
|
28-
LL | global_asm!("{}", const const_bar(S));
29-
| ^
13+
error[E0080]: evaluation of constant value failed
14+
--> $DIR/type-check-4.rs:25:44
3015
|
31-
= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
32-
= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
33-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
34-
= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
35-
= help: to fix this, the value can be extracted to a `const` and then used.
16+
LL | global_asm!("{}", const const_bar(unsafe { S }));
17+
| ^ constant accesses mutable global memory
3618

3719
error: aborting due to 3 previous errors
3820

39-
For more information about this error, try `rustc --explain E0658`.
21+
For more information about this error, try `rustc --explain E0080`.

Diff for: ‎tests/ui/asm/const-refs-to-static.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
//@ ignore-nvptx64
33
//@ ignore-spirv
44

5-
#![feature(const_refs_to_static)]
6-
75
use std::arch::{asm, global_asm};
86
use std::ptr::addr_of;
97

Diff for: ‎tests/ui/asm/const-refs-to-static.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: invalid type for `const` operand
2-
--> $DIR/const-refs-to-static.rs:12:19
2+
--> $DIR/const-refs-to-static.rs:10:19
33
|
44
LL | global_asm!("{}", const addr_of!(FOO));
55
| ^^^^^^-------------
@@ -9,7 +9,7 @@ LL | global_asm!("{}", const addr_of!(FOO));
99
= help: `const` operands must be of an integer type
1010

1111
error: invalid type for `const` operand
12-
--> $DIR/const-refs-to-static.rs:17:25
12+
--> $DIR/const-refs-to-static.rs:15:25
1313
|
1414
LL | unsafe { asm!("{}", const addr_of!(FOO)) };
1515
| ^^^^^^-------------

Diff for: ‎tests/ui/asm/x86_64/type-check-4.rs

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
//@ only-x86_64
2-
//@ compile-flags: -C target-feature=+avx512f
2+
//@ build-fail
33

4-
use std::arch::{asm, global_asm};
5-
6-
use std::arch::x86_64::{_mm256_setzero_ps, _mm_setzero_ps};
4+
use std::arch::global_asm;
75

86
fn main() {}
97

108
// Constants must be... constant
119

12-
static S: i32 = 1;
10+
static mut S: i32 = 1;
1311
const fn const_foo(x: i32) -> i32 {
1412
x
1513
}
1614
const fn const_bar<T>(x: T) -> T {
1715
x
1816
}
19-
global_asm!("{}", const S);
20-
//~^ ERROR referencing statics
17+
global_asm!("{}", const unsafe { S });
18+
//~^ ERROR evaluation of constant value failed
19+
//~| mutable global memory
2120
global_asm!("{}", const const_foo(0));
22-
global_asm!("{}", const const_foo(S));
23-
//~^ ERROR referencing statics
21+
global_asm!("{}", const const_foo(unsafe { S }));
22+
//~^ ERROR evaluation of constant value failed
23+
//~| mutable global memory
2424
global_asm!("{}", const const_bar(0));
25-
global_asm!("{}", const const_bar(S));
26-
//~^ ERROR referencing statics
25+
global_asm!("{}", const const_bar(unsafe { S }));
26+
//~^ ERROR evaluation of constant value failed
27+
//~| mutable global memory

Diff for: ‎tests/ui/asm/x86_64/type-check-4.stderr

+13-31
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,21 @@
1-
error[E0658]: referencing statics in constants is unstable
2-
--> $DIR/type-check-4.rs:19:25
1+
error[E0080]: evaluation of constant value failed
2+
--> $DIR/type-check-4.rs:17:34
33
|
4-
LL | global_asm!("{}", const S);
5-
| ^
6-
|
7-
= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
8-
= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
9-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
10-
= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
11-
= help: to fix this, the value can be extracted to a `const` and then used.
4+
LL | global_asm!("{}", const unsafe { S });
5+
| ^ constant accesses mutable global memory
126

13-
error[E0658]: referencing statics in constants is unstable
14-
--> $DIR/type-check-4.rs:22:35
15-
|
16-
LL | global_asm!("{}", const const_foo(S));
17-
| ^
7+
error[E0080]: evaluation of constant value failed
8+
--> $DIR/type-check-4.rs:21:44
189
|
19-
= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
20-
= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
21-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
22-
= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
23-
= help: to fix this, the value can be extracted to a `const` and then used.
10+
LL | global_asm!("{}", const const_foo(unsafe { S }));
11+
| ^ constant accesses mutable global memory
2412

25-
error[E0658]: referencing statics in constants is unstable
26-
--> $DIR/type-check-4.rs:25:35
27-
|
28-
LL | global_asm!("{}", const const_bar(S));
29-
| ^
13+
error[E0080]: evaluation of constant value failed
14+
--> $DIR/type-check-4.rs:25:44
3015
|
31-
= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
32-
= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
33-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
34-
= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
35-
= help: to fix this, the value can be extracted to a `const` and then used.
16+
LL | global_asm!("{}", const const_bar(unsafe { S }));
17+
| ^ constant accesses mutable global memory
3618

3719
error: aborting due to 3 previous errors
3820

39-
For more information about this error, try `rustc --explain E0658`.
21+
For more information about this error, try `rustc --explain E0080`.

Diff for: ‎tests/ui/consts/const-fn-not-safe-for-const.rs

-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ static Y: u32 = 0;
1818

1919
const fn get_Y() -> u32 {
2020
Y
21-
//~^ ERROR referencing statics in constant functions
2221
}
2322

2423
const fn get_Y_addr() -> &'static u32 {
2524
&Y
26-
//~^ ERROR referencing statics in constant functions
2725
}
2826

2927
const fn get() -> u32 {

Diff for: ‎tests/ui/consts/const-fn-not-safe-for-const.stderr

+2-27
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,6 @@ LL | random()
66
|
77
= note: calls in constant functions are limited to constant functions, tuple structs and tuple variants
88

9-
error[E0658]: referencing statics in constant functions is unstable
10-
--> $DIR/const-fn-not-safe-for-const.rs:20:5
11-
|
12-
LL | Y
13-
| ^
14-
|
15-
= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
16-
= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
17-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
18-
= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
19-
= help: to fix this, the value can be extracted to a `const` and then used.
20-
21-
error[E0658]: referencing statics in constant functions is unstable
22-
--> $DIR/const-fn-not-safe-for-const.rs:25:6
23-
|
24-
LL | &Y
25-
| ^
26-
|
27-
= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
28-
= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
29-
= note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
30-
= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
31-
= help: to fix this, the value can be extracted to a `const` and then used.
32-
33-
error: aborting due to 3 previous errors
9+
error: aborting due to 1 previous error
3410

35-
Some errors have detailed explanations: E0015, E0658.
36-
For more information about an error, try `rustc --explain E0015`.
11+
For more information about this error, try `rustc --explain E0015`.

Diff for: ‎tests/ui/consts/const-mut-refs/mut_ref_in_final_dynamic_check.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ normalize-stderr-test: "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
22
//@ normalize-stderr-test: "( 0x[0-9a-f][0-9a-f] │)? ([0-9a-f][0-9a-f] |__ |╾─*ALLOC[0-9]+(\+[a-z0-9]+)?(<imm>)?─*╼ )+ *│.*" -> " HEX_DUMP"
33
//@ normalize-stderr-test: "HEX_DUMP\s*\n\s*HEX_DUMP" -> "HEX_DUMP"
4-
#![feature(const_refs_to_static)]
54

65
use std::sync::Mutex;
76

0 commit comments

Comments
 (0)