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

wasm(32|64): update alignment string #134165

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Conversation

durin42
Copy link
Contributor

@durin42 durin42 commented Dec 11, 2024

See llvm/llvm-project@c5ab70c

@rustbot label: +llvm-main

@rustbot
Copy link
Collaborator

rustbot commented Dec 11, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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 Dec 11, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 11, 2024

These commits modify compiler targets.
(See the Target Tier Policy.)

@durin42
Copy link
Contributor Author

durin42 commented Dec 11, 2024

@rustbot label: +llvm-main

@rustbot rustbot added the llvm-main Marks PRs that are making Rust work with LLVM main (this label is consumed by CI tooling) label Dec 11, 2024
@jieyouxu
Copy link
Member

LLVM PR for backlink: llvm/llvm-project#119204

Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, one comment issue then r=me after PR CI is green.

compiler/rustc_codegen_llvm/src/context.rs Outdated Show resolved Hide resolved
@jieyouxu jieyouxu 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 11, 2024
@rust-log-analyzer

This comment has been minimized.

@durin42 durin42 force-pushed the wasm-target-string branch 3 times, most recently from c4d6ef3 to 0931a72 Compare December 11, 2024 10:18
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM

@jieyouxu
Copy link
Member

@durin42 can you also update the PR title and reflection, since we also now modify wasm64 targets?

@jieyouxu jieyouxu added the O-wasm Target: WASM (WebAssembly), http://webassembly.org/ label Dec 11, 2024
@durin42 durin42 changed the title wasm32: update alignment string wasm(32|64): update alignment string Dec 11, 2024
@durin42
Copy link
Contributor Author

durin42 commented Dec 11, 2024

@durin42 can you also update the PR title and reflection, since we also now modify wasm64 targets?

I'm not sure what you mean by reflection, but I updated the PR title

@jieyouxu
Copy link
Member

jieyouxu commented Dec 11, 2024

I'm not sure what you mean by reflection, but I updated the PR title

I managed to type "reflection" when I meant "description", lol. Thanks!

@jieyouxu jieyouxu added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 11, 2024
@durin42
Copy link
Contributor Author

durin42 commented Dec 11, 2024

force-pushed an updated log message

@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Dec 11, 2024

📌 Commit 48b8832 has been approved by jieyouxu

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 Dec 11, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#132975 (De-duplicate and improve definition of core::ffi::c_char)
 - rust-lang#133598 (Change `GetManyMutError` to match T-libs-api decision)
 - rust-lang#134148 (add comments in check_expr_field)
 - rust-lang#134163 (coverage: Rearrange the code for embedding per-function coverage metadata)
 - rust-lang#134165 (wasm(32|64): update alignment string)
 - rust-lang#134170 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit eefefbe into rust-lang:master Dec 11, 2024
6 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 11, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 11, 2024
Rollup merge of rust-lang#134165 - durin42:wasm-target-string, r=jieyouxu

wasm(32|64): update alignment string

See llvm/llvm-project@c5ab70c

`@rustbot` label: +llvm-main
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) O-wasm Target: WASM (WebAssembly), http://webassembly.org/ 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.

5 participants