Skip to content
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.

Sign up for GitHub

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

Jump to bottom

test miri-unleash TLS accesses #72893

Merged
merged 2 commits into from
Jun 2, 2020
Merged

test miri-unleash TLS accesses #72893

merged 2 commits into from
Jun 2, 2020

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jun 1, 2020

Finally gets rid of IS_SUPPORTED_IN_MIRI. :-)

I also added a test for the new asm! while I am at it.

r? @ecstatic-morse Cc @rust-lang/wg-const-eval

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2020
@RalfJung RalfJung mentioned this pull request Jun 1, 2020
Open
6 tasks
ecstatic-morse
ecstatic-morse reviewed Jun 1, 2020
View reviewed changes
Copy link
Contributor

@ecstatic-morse ecstatic-morse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with comment in test updated.

src/test/ui/consts/miri_unleashed/tls.rs Outdated
#[thread_local]
static A: u8 = 0;

// Make sure we catch executing inline assembly.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^

@RalfJung @Aaron1011
Fix comment
4f30c68 
Co-authored-by: Aaron Hill <[email protected]>
@RalfJung
Copy link
Member Author

RalfJung commented Jun 1, 2020

@bors r=ecstatic-morse

@bors
Copy link
Contributor

bors commented Jun 1, 2020

📌 Commit 4f30c68 has been approved by ecstatic-morse

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 1, 2020
@JohnTitor JohnTitor mentioned this pull request Jun 2, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2020
@bors
Auto merge of rust-lang#72905 - JohnTitor:rollup-phtyo5i, r=JohnTitor
10c2316 
Rollup of 10 pull requests

Successful merges:

 - rust-lang#72775 (Return early to avoid ICE)
 - rust-lang#72795 (Add a test for `$:ident` in proc macro input)
 - rust-lang#72822 (remove trivial calls to mk_const)
 - rust-lang#72825 (Clarify errors and warnings about the transition to the new asm!)
 - rust-lang#72827 (changed *nix to Unix-like)
 - rust-lang#72880 (Clean up E0637 explanation)
 - rust-lang#72886 (Remove allow missing_debug_implementations for MaybeUninit)
 - rust-lang#72889 (rustc: Remove the `--passive-segments` LLD flag on wasm)
 - rust-lang#72891 (Add associated consts MIN/MAX for Wrapping<Int>)
 - rust-lang#72893 (test miri-unleash TLS accesses)

Failed merges:

r? @ghost
@bors bors merged commit b7ec7bd into rust-lang:master Jun 2, 2020
@RalfJung RalfJung deleted the unleash-tls branch June 7, 2020 08:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Aaron1011 Aaron1011 Aaron1011 left review comments

@ecstatic-morse ecstatic-morse ecstatic-morse left review comments

Assignees

@ecstatic-morse ecstatic-morse

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RalfJung @bors @Aaron1011 @ecstatic-morse @rust-highfive