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

Revert #103779 #104727

Closed
wants to merge 1 commit into from
Closed

Revert #103779 #104727

wants to merge 1 commit into from

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented Nov 22, 2022 •
edited
Loading

The current implementation of the SIMD-optimized str.contains(), added in #103779, is unsound. See #104726 for more details about the unsoundness.

cc @the8472 @thomcc
Fixes #104726

@pietroalbini
Revert "Auto merge of rust-lang#103779 - the8472:simd-str-contains, r…
7953508 
…=thomcc"

The current implementation seems to be unsound. See rust-lang#104726.
@rustbot
Copy link
Collaborator

rustbot commented Nov 22, 2022

r? @thomcc

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Nov 22, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 22, 2022

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

@pietroalbini pietroalbini mentioned this pull request Nov 22, 2022
Closed
@thomcc
Copy link
Member

thomcc commented Nov 22, 2022

Ugh, oof. Nice catch.

@bors r+

@bors
Copy link
Contributor

bors commented Nov 22, 2022

📌 Commit 7953508 has been approved by thomcc

It is now in the queue for this repository.

@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 Nov 22, 2022
@thomcc
Copy link
Member

thomcc commented Nov 22, 2022

@the8472 Feel free to r- this if you think a simple fix is possible. I don't have time to look, but the indexing code in that was quite hairy, so it's not terribly surprising it hits issues.

@pietroalbini
Copy link
Member Author

@bors rollup=never p=10

Marking as rollup=never since this will affect perf, and p=10 since it fixes a soundness bug.

@thomcc
Copy link
Member

thomcc commented Nov 22, 2022

There's a real fix in #104735

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 22, 2022
@thomcc thomcc mentioned this pull request Nov 22, 2022
Merged
@the8472
Copy link
Member

the8472 commented Nov 22, 2022

#104735 has been merged and the issue has been closed, so this can be closed too.

@the8472 the8472 closed this Nov 22, 2022
@bors
Copy link
Contributor

bors commented Nov 23, 2022

☔ The latest upstream changes (presumably #104735) made this pull request unmergeable. Please resolve the merge conflicts.

@pietroalbini pietroalbini deleted the pa-revert-103779 branch November 23, 2022 08:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@thomcc thomcc

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Unsafe precondition violated in the x86_64 SIMD implementation of str.contains
5 participants
@pietroalbini @rustbot @thomcc @bors @the8472