Skip to content

LLVM changed the nocapture attribute to captures(none) #136287

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
Merged
merged 2 commits into from
Jan 31, 2025
Merged

LLVM changed the nocapture attribute to captures(none) #136287

merged 2 commits into from
Jan 31, 2025

Conversation

zmodem
Copy link
Contributor

@zmodem zmodem commented Jan 30, 2025

This updates RustWrapper.cpp and tests after
llvm/llvm-project#123181

@rustbot
Copy link
Collaborator

rustbot commented Jan 30, 2025

r? @cuviper

rustbot has assigned @cuviper.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 30, 2025
@zmodem
Copy link
Contributor Author

zmodem commented Jan 30, 2025

@rustbot label llvm-main
r? @nikic

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Jan 30, 2025
@rustbot rustbot assigned nikic and unassigned cuviper Jan 30, 2025
@nikic
Copy link
Contributor

nikic commented Jan 30, 2025

We'll want to change the Rust-side representation to captures in the future, but we can delay that until LLVM has some meaningful support for non-trivial captures specifications.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 30, 2025

📌 Commit 6e457b8 has been approved by nikic

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 Jan 30, 2025
@jhpratt jhpratt mentioned this pull request Jan 31, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2025
@bors
Auto merge of rust-lang#136331 - jhpratt:rollup-curo1f4, r=jhpratt
25a1657 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#135414 (Stabilize `const_black_box`)
 - rust-lang#136150 (ci: use windows 2025 for i686-mingw)
 - rust-lang#136258 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 11))
 - rust-lang#136270 (Remove `NamedVarMap`.)
 - rust-lang#136278 (add constraint graph to polonius MIR dump)
 - rust-lang#136287 (LLVM changed the nocapture attribute to captures(none))
 - rust-lang#136291 (some test suite cleanups)
 - rust-lang#136296 (float::min/max: mention the non-determinism around signed 0)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b87df23 into rust-lang:master Jan 31, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 31, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2025
@rust-timer
Unrolled build for rust-lang#136287
cd8d759 
Rollup merge of rust-lang#136287 - zmodem:nocapture, r=nikic

LLVM changed the nocapture attribute to captures(none)

This updates RustWrapper.cpp and tests after
llvm/llvm-project#123181
@durin42 durin42 mentioned this pull request Feb 21, 2025
Merged
durin42 added a commit to durin42/rust that referenced this pull request Feb 21, 2025
@durin42
tests: fix up new test for nocapture -> capture(none) change
536c526 
Same change as rust-lang#136287, but for a newly introduced test.

@rustbot label llvm-main
r? @nikic
durin42 added a commit to durin42/rust that referenced this pull request Feb 21, 2025
@durin42
tests: fix up new test for nocapture -> capture(none) change
9a9820e 
Same change as rust-lang#136287, but for a newly introduced test.

@rustbot label llvm-main
r? @nikic
durin42 added a commit to durin42/rust that referenced this pull request Feb 25, 2025
@durin42
tests: fix up new test for nocapture -> capture(none) change
b41c232 
Same motivation as rust-lang#136287, but for a newly introduced test. Rather than
over-constraining here, we just match the sret and accept pretty much
all other attributes.

@rustbot label llvm-main
r? @nikic
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2025
@matthiaskrgr
Rollup merge of rust-lang#137390 - durin42:llvm-21-nocapture-rename, …
fc997fb 
…r=nikic

tests: fix up new test for nocapture -> capture(none) change

Same change as rust-lang#136287, but for a newly introduced test.

`@rustbot` label llvm-main
r? `@nikic`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 1, 2025
@matthiaskrgr
Rollup merge of rust-lang#137390 - durin42:llvm-21-nocapture-rename, …
11ddd56 
…r=nikic

tests: fix up new test for nocapture -> capture(none) change

Same change as rust-lang#136287, but for a newly introduced test.

``@rustbot`` label llvm-main
r? ``@nikic``
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
@rust-timer
Unrolled build for rust-lang#137390
9fb1446 
Rollup merge of rust-lang#137390 - durin42:llvm-21-nocapture-rename, r=nikic

tests: fix up new test for nocapture -> capture(none) change

Same change as rust-lang#136287, but for a newly introduced test.

``@rustbot`` label llvm-main
r? ``@nikic``
GuillaumeGomez pushed a commit to GuillaumeGomez/rust that referenced this pull request Apr 18, 2025
@bors
Auto merge of rust-lang#136331 - jhpratt:rollup-curo1f4, r=jhpratt
afe0843 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#135414 (Stabilize `const_black_box`)
 - rust-lang#136150 (ci: use windows 2025 for i686-mingw)
 - rust-lang#136258 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 11))
 - rust-lang#136270 (Remove `NamedVarMap`.)
 - rust-lang#136278 (add constraint graph to polonius MIR dump)
 - rust-lang#136287 (LLVM changed the nocapture attribute to captures(none))
 - rust-lang#136291 (some test suite cleanups)
 - rust-lang#136296 (float::min/max: mention the non-determinism around signed 0)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikic nikic nikic left review comments

Assignees

@nikic nikic

Labels
llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.
5 participants
@zmodem @rustbot @nikic @bors @cuviper