bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

convert Rvalue::threadlocalref assertion to delay bug

Browse source
This commit is contained in:
csmoe 2021-06-01 22:05:04 +08:00
parent 9283956350
commit 521d9ab59a
3 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_mir/src/transform/check_consts/validation.rs
View file

@ -356,10 +356,9 @@ impl Validator<'mir, 'tcx> {
} }
fn check_static(&mut self, def_id: DefId, span: Span) { fn check_static(&mut self, def_id: DefId, span: Span) {
assert!( if self.tcx.is_thread_local_static(def_id) {
!self.tcx.is_thread_local_static(def_id), self.tcx.sess.delay_span_bug(span, "tls access is checked in `Rvalue::ThreadLocalRef");
"tls access is checked in `Rvalue::ThreadLocalRef" }
);
self.check_op_spanned(ops::StaticAccess, span) self.check_op_spanned(ops::StaticAccess, span)
} }
@ -732,11 +731,7 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
if proj_base.is_empty() { if proj_base.is_empty() {
if let (local, []) = (place_local, proj_base) { if let (local, []) = (place_local, proj_base) {
let decl = &self.body.local_decls[local]; let decl = &self.body.local_decls[local];
if let Some(box LocalInfo::StaticRef { if let Some(box LocalInfo::StaticRef { def_id, .. }) = decl.local_info {
def_id,
is_thread_local: false,
}) = decl.local_info
{
let span = decl.source_info.span; let span = decl.source_info.span;
self.check_static(def_id, span); self.check_static(def_id, span);
return; return;

2
src/test/ui/thread-local-static.rs
View file

@ -8,9 +8,9 @@ const fn g(x: &mut [u32; 8]) {
//~^ ERROR mutable references are not allowed //~^ ERROR mutable references are not allowed
std::mem::swap(x, &mut STATIC_VAR_2) std::mem::swap(x, &mut STATIC_VAR_2)
//~^ ERROR thread-local statics cannot be accessed //~^ ERROR thread-local statics cannot be accessed
//~| ERROR dereferencing raw pointers in constant
//~| ERROR mutable references are not allowed //~| ERROR mutable references are not allowed
//~| ERROR use of mutable static is unsafe //~| ERROR use of mutable static is unsafe
//~| constant functions cannot refer to statics
} }
fn main() {} fn main() {}

13
src/test/ui/thread-local-static.stderr
View file

@ -13,14 +13,13 @@ error[E0625]: thread-local statics cannot be accessed at compile-time
LL | std::mem::swap(x, &mut STATIC_VAR_2) LL | std::mem::swap(x, &mut STATIC_VAR_2)
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
error[E0658]: dereferencing raw pointers in constant functions is unstable error[E0013]: constant functions cannot refer to statics
--> $DIR/thread-local-static.rs:9:23 --> $DIR/thread-local-static.rs:9:28
| |
LL | std::mem::swap(x, &mut STATIC_VAR_2) 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: consider extracting the value of the `static` to a `const`, and referring to that
= help: add `#![feature(const_raw_ptr_deref)]` to the crate attributes to enable
error[E0658]: mutable references are not allowed in constant functions error[E0658]: mutable references are not allowed in constant functions
--> $DIR/thread-local-static.rs:9:23 --> $DIR/thread-local-static.rs:9:23
@ -41,5 +40,5 @@ LL | std::mem::swap(x, &mut STATIC_VAR_2)
error: aborting due to 5 previous errors error: aborting due to 5 previous errors
Some errors have detailed explanations: E0133, E0658. Some errors have detailed explanations: E0013, E0133, E0658.
For more information about an error, try `rustc --explain E0133`. For more information about an error, try `rustc --explain E0013`.