Move try_to_bits from Const to Valtree
#136130
Closed
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
PG-exploit-mitigations
|
Some changes occurred in compiler/rustc_sanitizers cc @rust-lang/project-exploit-mitigations, @rcvalle |
This comment has been minimized.
This comment has been minimized.
FedericoBruzzone
force-pushed
the
follow-up-135158
branch
from
b53347c to
312a32f
Compare
lukas-code
reviewed
Jan 27, 2025
FedericoBruzzone
force-pushed
the
follow-up-135158
branch
from
312a32f to
23ed79b
Compare
Currently, I introduced the proper type ( |
This comment has been minimized.
This comment has been minimized.
Signed-off-by: FedericoBruzzone <[email protected]>
FedericoBruzzone
force-pushed
the
follow-up-135158
branch
from
23ed79b to
9783e80
Compare
oli-obk
reviewed
Jan 28, 2025
Comment on lines
+37
to
+40
| struct ValTreeAndTy<'tcx> { | ||
| valtree: ty::ValTree<'tcx>, | ||
| ty: Ty<'tcx>, | ||
| } |
There was a problem hiding this comment.
cc @BoxyUwU this is a practical type we could use in more places, and implement methods like try_to_bits directly on, to avoid having to pass the type separately
There was a problem hiding this comment.
Ah yeah sorry this was intended to be follow up work from the original PR that removed Ty from ty::Const but it just didn't wind up happening 👍
There was a problem hiding this comment.
I have a branch that implements this PR's approach more globally (master...lukas-code:rust:typed-valtree), will send PR soon.
There was a problem hiding this comment.
I will look at that PR as soon as possible.
|
Closed in favor of #136180 |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 30, 2025
Introduce a wrapper for "typed valtrees" and properly check the type before extracting the value This PR adds a new wrapper type `ty::Value` to replace the tuple `(Ty, ty::ValTree)` and become the new canonical representation of type-level constant values. The value extraction methods `try_to_bits`/`try_to_bool`/`try_to_target_usize` are moved to this new type. For `try_to_bits` in particular, this avoids some redundant matches on `ty::ConstKind::Value`. Furthermore, these methods and will now properly check the type before extracting the value, which fixes some ICEs. The name `ty::Value` was chosen to be consistent with `ty::Expr`. Commit 1 should be non-functional and commit 2 adds the type check. --- fixes rust-lang#131102 supercedes rust-lang#136130 r? `@oli-obk` cc `@FedericoBruzzone` `@BoxyUwU`
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 31, 2025
Rollup merge of rust-lang#136180 - lukas-code:typed-valtree, r=oli-obk Introduce a wrapper for "typed valtrees" and properly check the type before extracting the value This PR adds a new wrapper type `ty::Value` to replace the tuple `(Ty, ty::ValTree)` and become the new canonical representation of type-level constant values. The value extraction methods `try_to_bits`/`try_to_bool`/`try_to_target_usize` are moved to this new type. For `try_to_bits` in particular, this avoids some redundant matches on `ty::ConstKind::Value`. Furthermore, these methods and will now properly check the type before extracting the value, which fixes some ICEs. The name `ty::Value` was chosen to be consistent with `ty::Expr`. Commit 1 should be non-functional and commit 2 adds the type check. --- fixes rust-lang#131102 supercedes rust-lang#136130 r? `@oli-obk` cc `@FedericoBruzzone` `@BoxyUwU`
github-actions bot
pushed a commit
to rust-lang/miri
that referenced
this pull request
Jan 31, 2025
Introduce a wrapper for "typed valtrees" and properly check the type before extracting the value This PR adds a new wrapper type `ty::Value` to replace the tuple `(Ty, ty::ValTree)` and become the new canonical representation of type-level constant values. The value extraction methods `try_to_bits`/`try_to_bool`/`try_to_target_usize` are moved to this new type. For `try_to_bits` in particular, this avoids some redundant matches on `ty::ConstKind::Value`. Furthermore, these methods and will now properly check the type before extracting the value, which fixes some ICEs. The name `ty::Value` was chosen to be consistent with `ty::Expr`. Commit 1 should be non-functional and commit 2 adds the type check. --- fixes rust-lang/rust#131102 supercedes rust-lang/rust#136130 r? `@oli-obk` cc `@FedericoBruzzone` `@BoxyUwU`
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.
This PR is a follow-up to #135158
What's in this PR?
try_to_bits: Transitioned fromConsttoValtree.validate_const_with_value: Renamed toextract_valtree_and_tyfor better clarity.Benefits
Valtreeavoids the need to re-evaluate aConst, improving efficiency where this re-evaluation was previously performed. For instance, in:TooGenericvariant toLayoutErrorand emitUnknown#135158).r? @lukas-code @oli-obk