Add a distinct OperandValue::ZeroSized variant for ZSTs
#111318
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
|
Some changes occurred in compiler/rustc_codegen_gcc cc @antoyo |
cjgillot
reviewed
May 7, 2023
scottmcm
force-pushed
the
operand-value-poison
branch
from
ebcd632
to
f315f57
Compare
Noratrieb
reviewed
May 22, 2023
| @@ -220,31 +223,33 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { | |||
| let fake_place = PlaceRef::new_sized_aligned(cast_ptr, cast, align); | |||
| Some(bx.load_operand(fake_place).val) | |||
| } | |||
| OperandValue::ZeroSized => { | |||
| let OperandValueKind::ZeroSized = operand_kind else { | |||
There was a problem hiding this comment.
Could this be an assert instead?
There was a problem hiding this comment.
It could. I wrote it this way for structural similarity with the other arms.
Maybe I should have made this be match (operand.val, operand_kind) instead? Unsure.
There was a problem hiding this comment.
Itś not that big of a deal, both branches are pretty short
compiler-errors
approved these changes
May 29, 2023
| @@ -220,31 +223,33 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { | |||
| let fake_place = PlaceRef::new_sized_aligned(cast_ptr, cast, align); | |||
| Some(bx.load_operand(fake_place).val) | |||
| } | |||
| OperandValue::ZeroSized => { | |||
| let OperandValueKind::ZeroSized = operand_kind else { | |||
There was a problem hiding this comment.
Itś not that big of a deal, both branches are pretty short
|
@bors r+ |
|
📌 Commit f315f57db8721e0993d9866c2cd5c3cae0fb6700 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
|
⌛ Testing commit f315f57db8721e0993d9866c2cd5c3cae0fb6700 with merge 28d692dccbadccb687ae571daf3591510a451529... |
This comment has been minimized.
This comment has been minimized.
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
Looks like a legit failure; I'll dig in. @bors r- |
bors
added
S-waiting-on-author
scottmcm
force-pushed
the
operand-value-poison
branch
2 times, most recently
from
b95bfa5
to
9495095
Compare
rustbot
added
A-testsuite
scottmcm
force-pushed
the
operand-value-poison
branch
from
4e90953
to
9495095
Compare
|
Ah, so we do need to pass ZSTs in some ABIs. Fix: https://github.com/rust-lang/rust/compare/b95bfa5b2db64d5e985e8a6fa83358df3df345aa..9495095fe68b737254a20e39b3c744ca41e66d6f @bors r=compiler-errors |
bors
added
S-waiting-on-bors
scottmcm
removed
A-testsuite
Noratrieb
added a commit
to Noratrieb/rust
that referenced
this pull request
May 30, 2023
…ompiler-errors Add a distinct `OperandValue::ZeroSized` variant for ZSTs These tend to have special handling in a bunch of places anyway, so the variant helps remember that. And I think it's easier to grok than `Aggregate`s sometimes being `Immediates` (after all, I previously got that wrong and caused rust-lang#109992). As a minor bonus, it means we don't need to generate poison LLVM values for ZSTs to pass around in `OperandValue::Immediate`s. Inspired by rust-lang#110021 (comment), so r? `@compiler-errors`
Noratrieb
added a commit
to Noratrieb/rust
that referenced
this pull request
May 30, 2023
…ompiler-errors Add a distinct `OperandValue::ZeroSized` variant for ZSTs These tend to have special handling in a bunch of places anyway, so the variant helps remember that. And I think it's easier to grok than `Aggregate`s sometimes being `Immediates` (after all, I previously got that wrong and caused rust-lang#109992). As a minor bonus, it means we don't need to generate poison LLVM values for ZSTs to pass around in `OperandValue::Immediate`s. Inspired by rust-lang#110021 (comment), so r? ``@compiler-errors``
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
May 31, 2023
…ompiler-errors Add a distinct `OperandValue::ZeroSized` variant for ZSTs These tend to have special handling in a bunch of places anyway, so the variant helps remember that. And I think it's easier to grok than `Aggregate`s sometimes being `Immediates` (after all, I previously got that wrong and caused rust-lang#109992). As a minor bonus, it means we don't need to generate poison LLVM values for ZSTs to pass around in `OperandValue::Immediate`s. Inspired by rust-lang#110021 (comment), so r? ```@compiler-errors```
bors
added
S-waiting-on-author
This comment has been minimized.
This comment has been minimized.
These tend to have special handling in a bunch of places anyway, so the variant helps remember that. And I think it's easier to grok than non-Scalar Aggregates sometimes being `Immediates` (like I got wrong and caused 109992). As a minor bonus, it means we don't need to generate poison LLVM values for them to pass around in `OperandValue::Immediate`s.
scottmcm
force-pushed
the
operand-value-poison
branch
from
9495095
to
bf36193
Compare
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2023
Rollup of 7 pull requests Successful merges: - rust-lang#108459 (rustdoc: Fix LinkReplacer link matching) - rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs) - rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers) - rust-lang#111980 (Preserve substs in opaques recorded in typeck results) - rust-lang#112024 (Don't suggest break through nested items) - rust-lang#112128 (Don't compute inlining status of mono items in advance.) - rust-lang#112141 (remove reference to Into in ? operator core/std docs, fix rust-lang#111655) Failed merges: - rust-lang#112071 (Group rfcs tests) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These tend to have special handling in a bunch of places anyway, so the variant helps remember that. And I think it's easier to grok than
Aggregates sometimes beingImmediates(after all, I previously got that wrong and caused #109992). As a minor bonus, it means we don't need to generate poison LLVM values for ZSTs to pass around inOperandValue::Immediates.Inspired by #110021 (comment), so
r? @compiler-errors