-
Notifications
You must be signed in to change notification settings - Fork 13.4k
[mir] Special treatment for dereferencing a borrow to a static definition #74945
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
bors
merged 5 commits into
rust-lang:master
from
dingxiangfei2009:promote-static-ref-deref
Aug 1, 2020
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ddbe69a
Special treatment for dereferencing a borrow to a static definition
dingxiangfei2009 3b2642f
Add comments to explain the test case and the special treatment
dingxiangfei2009 db07174
Remove a trailing space
dingxiangfei2009 4631579
rustfmt
dingxiangfei2009 c511454
Add the proper tests
dingxiangfei2009 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,34 @@ | ||
// check-pass | ||
|
||
// Use of global static variables in literal values should be allowed for | ||
// promotion. | ||
// This test is to demonstrate the issue raised in | ||
// https://github.com/rust-lang/rust/issues/70584 | ||
|
||
// Literal values were previously promoted into local static values when | ||
// other global static variables are used. | ||
|
||
struct A<T: 'static>(&'static T); | ||
oli-obk marked this conversation as resolved.
Show resolved
Hide resolved
|
||
struct B<T: 'static + ?Sized> { | ||
x: &'static T, | ||
} | ||
static STR: &'static [u8] = b"hi"; | ||
static C: A<B<B<[u8]>>> = { | ||
A(&B { | ||
x: &B { x: STR }, | ||
}) | ||
}; | ||
|
||
pub struct Slice(&'static [i32]); | ||
|
||
static CONTENT: i32 = 42; | ||
pub static CONTENT_MAP: Slice = Slice(&[CONTENT]); | ||
|
||
pub static FOO: (i32, i32) = (42, 43); | ||
pub static CONTENT_MAP2: Slice = Slice(&[FOO.0]); | ||
|
||
fn main() { | ||
assert_eq!(b"hi", C.0.x.x); | ||
assert_eq!(&[42], CONTENT_MAP.0); | ||
assert_eq!(&[42], CONTENT_MAP2.0); | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.