-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of #75585 - RalfJung:demotion, r=oli-obk
Do not promote &mut of a non-ZST ever Since ~pre-1.0~ 1.36, we have accepted code like this: ```rust static mut TEST: &'static mut [i32] = { let x = &mut [1,2,3]; x }; ``` I tracked it back to #21744, but unfortunately could not find any discussion or RFC that would explain why we thought this was a good idea. And it's not, it breaks all sorts of things -- see #75556. To fix #75556, we have to stop promoting non-ZST mutable references no matter the context, which is what this PR does. It's a breaking change. Notice that this still works, since it does not rely on promotion: ```rust static mut TEST: &'static mut [i32] = &mut [0,1,2]; ``` Cc `@rust-lang/wg-const-eval`
- Loading branch information
Showing
4 changed files
with
52 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// ignore-tidy-linelength | ||
// We do not promote mutable references. | ||
static mut TEST1: Option<&mut [i32]> = Some(&mut [1, 2, 3]); //~ ERROR temporary value dropped while borrowed | ||
|
||
static mut TEST2: &'static mut [i32] = { | ||
let x = &mut [1,2,3]; //~ ERROR temporary value dropped while borrowed | ||
x | ||
}; | ||
|
||
fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
error[E0716]: temporary value dropped while borrowed | ||
--> $DIR/promote-no-mut.rs:3:50 | ||
| | ||
LL | static mut TEST1: Option<&mut [i32]> = Some(&mut [1, 2, 3]); | ||
| ----------^^^^^^^^^- | ||
| | | | | ||
| | | temporary value is freed at the end of this statement | ||
| | creates a temporary which is freed while still in use | ||
| using this value as a static requires that borrow lasts for `'static` | ||
|
||
error[E0716]: temporary value dropped while borrowed | ||
--> $DIR/promote-no-mut.rs:6:18 | ||
| | ||
LL | let x = &mut [1,2,3]; | ||
| ^^^^^^^ creates a temporary which is freed while still in use | ||
LL | x | ||
| - using this value as a static requires that borrow lasts for `'static` | ||
LL | }; | ||
| - temporary value is freed at the end of this statement | ||
|
||
error: aborting due to 2 previous errors | ||
|
||
For more information about this error, try `rustc --explain E0716`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
// run-pass | ||
#![feature(const_mut_refs)] | ||
|
||
static mut TEST: i32 = { | ||
// We must not promote this, as CTFE needs to be able to mutate it later. | ||
let x = &mut [1,2,3]; | ||
x[0] += 1; | ||
x[0] | ||
}; | ||
|
||
// This still works -- it's not done via promotion. | ||
#[allow(unused)] | ||
static mut TEST2: &'static mut [i32] = &mut [0,1,2]; | ||
|
||
fn main() { | ||
assert_eq!(unsafe { TEST }, 2); | ||
} |