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

Subtree sync for rustc_codegen_cranelift #124286

Merged
merged 32 commits into from
Apr 23, 2024

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Apr 23, 2024

This fixes a crash when compiling the standard library. In addition the Cranelift update fixes all the 128bit int abi incompatibility between cg_clif and cg_llvm.

r? @ghost

@rustbot label +A-codegen +A-cranelift +T-compiler

bjorn3 and others added 30 commits April 11, 2024 10:42
Allow MaybeUninit in input and output of inline assembly
…-obk

interpret: use ScalarInt for bin-ops; avoid PartialOrd for ScalarInt

Best reviewed commit-by-commit

r? `@oli-obk`
static_mut_refs: use raw pointers to remove the remaining FIXME

Using `SyncUnsafeCell` would not make a lot of sense IMO.
It only has a single use and doesn't need access to CValue internals.
This removes one copy of the windows bindings
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 23, 2024
@rustbot
Copy link
Collaborator

rustbot commented Apr 23, 2024

The list of allowed third-party dependencies may have been modified! You must ensure that any new dependencies have compatible licenses before merging.

cc @davidtwco, @wesleywiser

@bjorn3
Copy link
Member Author

bjorn3 commented Apr 23, 2024

@bors r+ p=1 subtree sync

@bors
Copy link
Contributor

bors commented Apr 23, 2024

📌 Commit 7c968a2 has been approved by bjorn3

It is now in the queue for this repository.

@rust-log-analyzer

This comment has been minimized.

@matthiaskrgr
Copy link
Member

@bors r- it no werky

@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 Apr 23, 2024
@bjorn3
Copy link
Member Author

bjorn3 commented Apr 23, 2024

Git subtree forgot to sync back a change I made.

@bors r+ p=1 subtree sync

@bors
Copy link
Contributor

bors commented Apr 23, 2024

📌 Commit 96152c7 has been approved by bjorn3

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 23, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 23, 2024
…bjorn3

Subtree sync for rustc_codegen_cranelift

This fixes a crash when compiling the standard library. In addition the Cranelift update fixes all the 128bit int abi incompatibility between cg_clif and cg_llvm.

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 23, 2024
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#124003 (Dellvmize some intrinsics (use `u32` instead of `Self` in some integer intrinsics))
 - rust-lang#124169 (Don't fatal when calling `expect_one_of` when recovering arg in `parse_seq`)
 - rust-lang#124286 (Subtree sync for rustc_codegen_cranelift)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a760954 into rust-lang:master Apr 23, 2024
12 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 23, 2024
Rollup merge of rust-lang#124286 - bjorn3:sync_cg_clif-2024-04-23, r=bjorn3

Subtree sync for rustc_codegen_cranelift

This fixes a crash when compiling the standard library. In addition the Cranelift update fixes all the 128bit int abi incompatibility between cg_clif and cg_llvm.

r? ``@ghost``

``@rustbot`` label +A-codegen +A-cranelift +T-compiler
@rustbot rustbot added this to the 1.79.0 milestone Apr 23, 2024
@bors
Copy link
Contributor

bors commented Apr 23, 2024

⌛ Testing commit 96152c7 with merge 40dcd79...

@bjorn3
Copy link
Member Author

bjorn3 commented Apr 24, 2024

@bors r- force

@fmease
Copy link
Member

fmease commented Apr 24, 2024

Still in the queue, what the hell?

@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 Apr 24, 2024
@fmease
Copy link
Member

fmease commented Apr 24, 2024

Time to synchronize I suppose ... :(

@fmease
Copy link
Member

fmease commented Apr 24, 2024

That did the job.

@bjorn3 bjorn3 deleted the sync_cg_clif-2024-04-23 branch April 24, 2024 12:19
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request May 13, 2024
…bjorn3

Subtree sync for rustc_codegen_cranelift

This fixes a crash when compiling the standard library. In addition the Cranelift update fixes all the 128bit int abi incompatibility between cg_clif and cg_llvm.

r? ``@ghost``

``@rustbot`` label +A-codegen +A-cranelift +T-compiler
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend A-testsuite Area: The testsuite used to check the correctness of rustc has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.