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.

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

Add compile time checks for unchecked_shl/shr #53991

Merged
merged 3 commits into from
Sep 7, 2018
Merged

Add compile time checks for unchecked_shl/shr #53991

merged 3 commits into from
Sep 7, 2018

Conversation

TimDiekmann
Copy link
Member

@TimDiekmann TimDiekmann commented Sep 6, 2018

r? @RalfJung

cc @oli-obk

#53697 broke miri's test suite as described in this comment. This PR adds test for the unchecked_shr/shl for the intrinsics.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 6, 2018
@oli-obk
Copy link
Contributor

oli-obk commented Sep 6, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Sep 6, 2018

📌 Commit 92dd526 has been approved by oli-obk

@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 Sep 6, 2018
@RalfJung
Copy link
Member

RalfJung commented Sep 6, 2018 via email

@TimDiekmann
Copy link
Member Author

TimDiekmann commented Sep 6, 2018

@RalfJung, Yes, indeed. I'll add I added a commit in a few moments ago.

@oli-obk
Copy link
Contributor

oli-obk commented Sep 6, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Sep 6, 2018

📌 Commit 43eb925 has been approved by oli-obk

@RalfJung
Copy link
Member

RalfJung commented Sep 6, 2018

Awesome, thanks. :)

@TimDiekmann would you like to also send a PR to miri to remove the now-dead code over there implementing the intrinsics you added on the rustc side? See rust-lang/miri#448 for a similar PR.

kennytm added a commit to kennytm/rust that referenced this pull request Sep 7, 2018
…s, r=oli-obk

Add unchecked_shl/shr check for intrinsics to fix miri's test suit

r? @RalfJung

cc @oli-obk

rust-lang#53697 broke miri's test suite as described in [this comment](rust-lang#53697 (comment)). This PR adds test for the `unchecked_shr/shl` for the intrinsics.
bors added a commit that referenced this pull request Sep 7, 2018
Rollup of 17 pull requests

Successful merges:

 - #53299 (Updated core/macros.rs to note it works in a no_std environment.)
 - #53376 (Cross reference io::copy and fs::copy in docs.)
 - #53455 (Individual docs for {from,to}_*_bytes)
 - #53550 (librustc_lint: In recursion warning, change 'recurring' to 'recursing')
 - #53860 (Migrate (some) of run-pass/ to ui)
 - #53874 (Implement Unpin for Box, Rc, and Arc)
 - #53895 (tidy: Cleanups and clippy warning fixes)
 - #53946 (Clarify `ManuallyDrop` docs)
 - #53948 (Minimized clippy test from when NLL disabled two-phase borrows)
 - #53959 (Add .git extension to submodule paths missing it)
 - #53966 (A few cleanups and minor improvements to mir/dataflow)
 - #53967 (propagate build.python into cmake)
 - #53979 (Remove `#[repr(transparent)]` from atomics)
 - #53991 (Add unchecked_shl/shr check for intrinsics to fix miri's test suit)
 - #53992 (migrate run-pass/borrowck to ui/run-pass)
 - #53994 (migrate run-pass/*/ to ui/run-pass)
 - #54023 (update clippy submodule)
@bors bors merged commit 43eb925 into rust-lang:master Sep 7, 2018
@TimDiekmann TimDiekmann changed the title Add unchecked_shl/shr check for intrinsics to fix miri's test suit Add compile time checks for unchecked_shl/shr Sep 8, 2018
@TimDiekmann TimDiekmann deleted the fix-unchecked-intrinsics branch September 8, 2018 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants