Skip to content

Revert #69280 #69333

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
merged 1 commit into from
Feb 22, 2020
Merged

Revert #69280 #69333

merged 1 commit into from
Feb 22, 2020

Conversation

ecstatic-morse
Copy link
Contributor

@ecstatic-morse ecstatic-morse commented Feb 21, 2020

Resolves #69313 by reverting #69280.

After #69280, #[rustc_args_required_const(2)] is required on the declaration of simd_shuffle intrinsics. This is allowed breakage, since you can't define platform intrinsics on stable. However, the latest release of the widely used packed_simd crate defines these intrinsics without the requisite attribute. Since there's no urgency to merge #69280, let's revert it. We can reconsider when rust-lang/packed_simd#278 is included in a point release of packed_simd.

r? @petrochenkov

…fle-no-special-case, r=petrochenkov"

This reverts commit 61d3b6d, reversing
changes made to c6ad1e2.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 21, 2020
@ecstatic-morse ecstatic-morse changed the title Revert "Rollup merge of #69280" Revert #69280 Feb 21, 2020
@pnkfelix
Copy link
Member

@ecstatic-morse shouldn't this also add a regression test for #69313, so we don't hit it again when someone re-attempts doing #69280 ?

@ecstatic-morse
Copy link
Contributor Author

ecstatic-morse commented Feb 21, 2020

@pnkfelix simd-intrinsics-generic-elements will ICE in the same way as that issue.

I knew there could be breakage due to #69280. This breakage is allowed since defining simd_shuffle requires platform_intrinsics. However, I missed that this was done in packed_simd as well as stdarch, and it seemed impolite to break everyone using packed_simd with zero notice.

We should do a crater run before retrying #69280, although I suspect there will be a lot of regressions due to pinned versions of packed_simd.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 21, 2020

📌 Commit 16790ae has been approved by petrochenkov

@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 Feb 21, 2020
@bors
Copy link
Collaborator

bors commented Feb 22, 2020

⌛ Testing commit 16790ae with merge 0753459...

@bors
Copy link
Collaborator

bors commented Feb 22, 2020

☀️ Test successful - checks-azure
Approved by: petrochenkov
Pushing 0753459 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 22, 2020
@bors bors merged commit 0753459 into rust-lang:master Feb 22, 2020
@ecstatic-morse ecstatic-morse deleted the revert-simd-shuffle branch October 6, 2020 01:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.

ICE with rustc claiming non-constant shuffle indices when they are constant (block.rs:622)
5 participants