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

LLVM 16: Switch to using MemoryEffects #103977

Merged
merged 1 commit into from
Nov 5, 2022
Merged

Conversation

TimNN
Copy link
Contributor

@TimNN TimNN commented Nov 4, 2022

This adapts the compiler to the changes required by llvm/llvm-project@304f1d5.

AFAICT, WriteOnly isn't used by the compiler, all ReadNone uses were migrated and the remaining use of ReadOnly is only for function parameters.

To simplify the FFI, this PR uses an enum to represent MemoryEffects across the FFI boundary, which then gets mapped to the matching static factory method when constructing the attribute.

Fixes #103961.

@rustbot label +llvm-main

r? @nikic

@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 Nov 4, 2022
@rustbot
Copy link
Collaborator

rustbot commented Nov 4, 2022

Error: Label llvm-main can only be set by Rust team members

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

@nikic nikic added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Nov 4, 2022
Copy link
Contributor

@durin42 durin42 left a comment

Choose a reason for hiding this comment

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

LGTM modulo the typo I spotted

compiler/rustc_codegen_llvm/src/llvm/ffi.rs Outdated Show resolved Hide resolved
@nikic
Copy link
Contributor

nikic commented Nov 4, 2022

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 4, 2022

📌 Commit c15cfc9 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 Nov 4, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 5, 2022
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#103868 (Use `TraitEngine` (by itself) less)
 - rust-lang#103878 (Fix artifact version/channel detection for stable)
 - rust-lang#103946 (Cleanup bind_pattern args)
 - rust-lang#103956 (Make mir opt unused file check blessable)
 - rust-lang#103977 (LLVM 16: Switch to using MemoryEffects)
 - rust-lang#103980 (rustdoc: simplify search results CSS and DOM)
 - rust-lang#103984 (Refactor tcx mk_const parameters.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f6ca5aa into rust-lang:master Nov 5, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 5, 2022
@TimNN TimNN deleted the memory-effects branch November 5, 2022 13:09
aarongable pushed a commit to chromium/chromium that referenced this pull request Nov 22, 2022
Update nightly release from 2022-11-01 to 2022-11-18

Rolls in:
* rust-lang/rust#103367
* rust-lang/rust#103977

Fixed: 1383950
Change-Id: I60ad4a8209eafac4d944a9f6ef873359062dd1ba

No-Try: true
Change-Id: I60ad4a8209eafac4d944a9f6ef873359062dd1ba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4013723
Auto-Submit: Collin Baker <collinbaker@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1074798}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

[LLVM HEAD] Build fails due to memory attribute changes
5 participants