CalledClosureAsFunction,
VtableForArgumentlessMethod,
ModifiedConstantMemory,
+ ModifiedStatic,
AssumptionNotHeld,
InlineAsm,
ReallocateNonBasePtr,
CalledClosureAsFunction,
VtableForArgumentlessMethod,
ModifiedConstantMemory,
+ ModifiedStatic,
AssumptionNotHeld,
InlineAsm,
TypeNotPrimitive(Ty<'tcx>),
"tried to call a vtable function without arguments",
ModifiedConstantMemory =>
"tried to modify constant memory",
+ ModifiedStatic =>
+ "tried to modify a static's initial value from another static's initializer",
AssumptionNotHeld =>
"`assume` argument was false",
InlineAsm =>
if alloc.mutability == Mutability::Immutable {
return err!(ModifiedConstantMemory);
}
- let kind = M::STATIC_KIND.expect(
- "An allocation is being mutated but the machine does not expect that to happen"
- );
- Ok((MemoryKind::Machine(kind), alloc.into_owned()))
+ match M::STATIC_KIND {
+ Some(kind) => Ok((MemoryKind::Machine(kind), alloc.into_owned())),
+ None => err!(ModifiedStatic),
+ }
});
// Unpack the error type manually because type inference doesn't
// work otherwise (and we cannot help it because `impl Trait`)
| CalledClosureAsFunction
| VtableForArgumentlessMethod
| ModifiedConstantMemory
+ | ModifiedStatic
| AssumptionNotHeld
// FIXME: should probably be removed and turned into a bug! call
| TypeNotPrimitive(_)
match dest {
Place::Local(index) => break *index,
Place::Projection(proj) => dest = &proj.base,
- Place::Promoted(..) | Place::Static(..) => {
+ Place::Promoted(..) => bug!("promoteds don't exist yet during promotion"),
+ Place::Static(..) => {
// Catch more errors in the destination.
self.visit_place(
dest,
// Only allow statics (not consts) to refer to other statics.
if self.mode == Mode::Static || self.mode == Mode::StaticMut {
if context.is_mutating_use() {
+ // this is not strictly necessary as miri will also bail out
+ // For interior mutability we can't really catch this statically as that
+ // goes through raw pointers and intermediate temporaries, so miri has
+ // to catch this anyway
self.tcx.sess.span_err(
self.span,
"cannot mutate statics in the initializer of another static",
--- /dev/null
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// New test for #53818: modifying static memory at compile-time is not allowed.
+// The test should never compile successfully
+
+#![feature(const_raw_ptr_deref)]
+#![feature(const_let)]
+
+use std::cell::UnsafeCell;
+
+struct Foo(UnsafeCell<u32>);
+
+unsafe impl Send for Foo {}
+unsafe impl Sync for Foo {}
+
+static FOO: Foo = Foo(UnsafeCell::new(42));
+
+static BAR: () = unsafe {
+ *FOO.0.get() = 5; //~ ERROR could not evaluate static initializer
+};
+
+fn main() {}
--- /dev/null
+error[E0080]: could not evaluate static initializer
+ --> $DIR/assign-to-static-within-other-static-2.rs:27:5
+ |
+LL | *FOO.0.get() = 5; //~ ERROR could not evaluate static initializer
+ | ^^^^^^^^^^^^^^^^ tried to modify a static's initial value from another static's initializer
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0080`.
use std::cell::UnsafeCell;
-struct Foo(UnsafeCell<u32>);
-
-unsafe impl Send for Foo {}
-unsafe impl Sync for Foo {}
-
-static FOO: Foo = Foo(UnsafeCell::new(42));
-
-static BAR: () = unsafe {
- *FOO.0.get() = 5;
-};
-
-static mut FOO2: u32 = 42;
-static BOO2: () = unsafe {
- FOO2 = 5;
+static mut FOO: u32 = 42;
+static BOO: () = unsafe {
+ FOO = 5; //~ ERROR cannot mutate statics in the initializer of another static
};
fn main() {}
error: cannot mutate statics in the initializer of another static
- --> $DIR/assign-to-static-within-other-static.rs:32:5
+ --> $DIR/assign-to-static-within-other-static.rs:21:5
|
-LL | FOO2 = 5;
- | ^^^^^^^^
+LL | FOO = 5; //~ ERROR cannot mutate statics in the initializer of another static
+ | ^^^^^^^
error: aborting due to previous error
const CR: &'static mut i32 = &mut C; //~ ERROR E0017
static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
//~| ERROR cannot borrow
+ //~| ERROR cannot mutate statics
static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
fn main() {}
LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
| ^^^^^^ constants require immutable values
+error: cannot mutate statics in the initializer of another static
+ --> $DIR/E0017.rs:15:39
+ |
+LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+ | ^^^^^^
+
error[E0017]: references in statics may only refer to immutable values
--> $DIR/E0017.rs:15:39
|
| ^
error[E0017]: references in statics may only refer to immutable values
- --> $DIR/E0017.rs:17:38
+ --> $DIR/E0017.rs:18:38
|
LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
| ^^^^^^ statics require immutable values
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
Some errors occurred: E0017, E0596.
For more information about an error, try `rustc --explain E0017`.
const CR: &'static mut i32 = &mut C; //~ ERROR E0017
static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
//~| ERROR cannot borrow
+ //~| ERROR cannot mutate statics
static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
fn main() {}
LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
| ^^^^^^ constants require immutable values
+error: cannot mutate statics in the initializer of another static
+ --> $DIR/E0388.rs:15:39
+ |
+LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+ | ^^^^^^
+
error[E0017]: references in statics may only refer to immutable values
--> $DIR/E0388.rs:15:39
|
| ^
error[E0017]: references in statics may only refer to immutable values
- --> $DIR/E0388.rs:17:38
+ --> $DIR/E0388.rs:18:38
|
LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
| ^^^^^^ statics require immutable values
-error: aborting due to 4 previous errors
+error: aborting due to 5 previous errors
Some errors occurred: E0017, E0596.
For more information about an error, try `rustc --explain E0017`.
pub static mut A: u32 = 0;
pub static mut B: () = unsafe { A = 1; };
-//~^ ERROR statements in statics are unstable
+//~^ ERROR cannot mutate statics in the initializer of another static
pub static mut C: u32 = unsafe { C = 1; 0 };
-//~^ ERROR statements in statics are unstable
+//~^ ERROR cannot mutate statics in the initializer of another static
pub static D: u32 = D;
-error[E0658]: statements in statics are unstable (see issue #48821)
+error: cannot mutate statics in the initializer of another static
--> $DIR/write-to-static-mut-in-static.rs:14:33
|
LL | pub static mut B: () = unsafe { A = 1; };
| ^^^^^
- |
- = help: add #![feature(const_let)] to the crate attributes to enable
-error[E0658]: statements in statics are unstable (see issue #48821)
+error: cannot mutate statics in the initializer of another static
--> $DIR/write-to-static-mut-in-static.rs:17:34
|
LL | pub static mut C: u32 = unsafe { C = 1; 0 };
| ^^^^^
- |
- = help: add #![feature(const_let)] to the crate attributes to enable
error: aborting due to 2 previous errors
-For more information about this error, try `rustc --explain E0658`.
projects / rust.git / commitdiff