Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion compiler/rustc_mir/src/transform/check_consts/validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,11 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
if proj_base.is_empty() {
if let (local, []) = (place_local, proj_base) {
let decl = &self.body.local_decls[local];
if let Some(box LocalInfo::StaticRef { def_id, .. }) = decl.local_info {
if let Some(box LocalInfo::StaticRef {
def_id,
is_thread_local: false,
}) = decl.local_info
{
let span = decl.source_info.span;
self.check_static(def_id, span);
return;
Expand Down
16 changes: 16 additions & 0 deletions src/test/ui/thread-local-static.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// edition:2018

#![feature(thread_local)]
#![feature(const_swap)]
#[thread_local]
static mut STATIC_VAR_2: [u32; 8] = [4; 8];
const fn g(x: &mut [u32; 8]) {
//~^ ERROR mutable references are not allowed
std::mem::swap(x, &mut STATIC_VAR_2)
//~^ ERROR thread-local statics cannot be accessed
//~| ERROR dereferencing raw pointers in constant
//~| ERROR mutable references are not allowed
//~| ERROR use of mutable static is unsafe
}

fn main() {}
45 changes: 45 additions & 0 deletions src/test/ui/thread-local-static.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
error[E0658]: mutable references are not allowed in constant functions
--> $DIR/thread-local-static.rs:7:12
|
LL | const fn g(x: &mut [u32; 8]) {
| ^
|
= note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
= help: add `#![feature(const_mut_refs)]` to the crate attributes to enable

error[E0625]: thread-local statics cannot be accessed at compile-time
--> $DIR/thread-local-static.rs:9:28
|
LL | std::mem::swap(x, &mut STATIC_VAR_2)
| ^^^^^^^^^^^^

error[E0658]: dereferencing raw pointers in constant functions is unstable
--> $DIR/thread-local-static.rs:9:23
|
LL | std::mem::swap(x, &mut STATIC_VAR_2)
| ^^^^^^^^^^^^^^^^^
|
= note: see issue #51911 <https://github.com/rust-lang/rust/issues/51911> for more information
= help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable

error[E0658]: mutable references are not allowed in constant functions
--> $DIR/thread-local-static.rs:9:23
|
LL | std::mem::swap(x, &mut STATIC_VAR_2)
| ^^^^^^^^^^^^^^^^^
|
= note: see issue #57349 <https://github.com/rust-lang/rust/issues/57349> for more information
= help: add `#![feature(const_mut_refs)]` to the crate attributes to enable

error[E0133]: use of mutable static is unsafe and requires unsafe function or block
--> $DIR/thread-local-static.rs:9:23
|
LL | std::mem::swap(x, &mut STATIC_VAR_2)
| ^^^^^^^^^^^^^^^^^ use of mutable static
|
= note: mutable statics can be mutated by multiple threads: aliasing violations or data races will cause undefined behavior

error: aborting due to 5 previous errors

Some errors have detailed explanations: E0133, E0658.
For more information about an error, try `rustc --explain E0133`.