Skip to content

Commit

Permalink
Disallow statics initializing themselves
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed Apr 23, 2020
1 parent 2b25c0c commit af44cdf
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 3 deletions.
11 changes: 10 additions & 1 deletion src/librustc_mir/interpret/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,16 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> Memory<'mir, 'tcx, M> {

// We can still be zero-sized in this branch, in which case we have to
// return `None`.
if size.bytes() == 0 { None } else { Some(ptr) }
if size.bytes() == 0 {
// We may be reading from a static.
// In order to ensure that `static FOO: Type = FOO;` causes a cycle error
// instead of magically pulling *any* ZST value from the ether, we need to
// trigger a read here.
self.get_raw(ptr.alloc_id)?;
None
} else {
Some(ptr)
}
}
})
}
Expand Down
8 changes: 6 additions & 2 deletions src/test/ui/consts/recursive-zst-static.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// build-pass
// This test ensures that we do not allow ZST statics to initialize themselves without ever
// actually creating a value of that type. This is important, as the ZST may have private fields
// that users can reasonably expect to only get initialized by their own code. Thus unsafe code
// can depend on this fact and will thus do unsound things when it is violated.
// See https://github.com/rust-lang/rust/issues/71078 for more details.

static FOO: () = FOO;
static FOO: () = FOO; //~ cycle detected when const-evaluating `FOO`

fn main() {
FOO
Expand Down
21 changes: 21 additions & 0 deletions src/test/ui/consts/recursive-zst-static.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
error[E0391]: cycle detected when const-evaluating `FOO`
--> $DIR/recursive-zst-static.rs:7:18
|
LL | static FOO: () = FOO;
| ^^^
|
note: ...which requires const-evaluating `FOO`...
--> $DIR/recursive-zst-static.rs:7:1
|
LL | static FOO: () = FOO;
| ^^^^^^^^^^^^^^^^^^^^^
= note: ...which again requires const-evaluating `FOO`, completing the cycle
note: cycle used when const-evaluating + checking `FOO`
--> $DIR/recursive-zst-static.rs:7:1
|
LL | static FOO: () = FOO;
| ^^^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error

For more information about this error, try `rustc --explain E0391`.

0 comments on commit af44cdf

Please sign in to comment.