-
Notifications
You must be signed in to change notification settings - Fork 14k
MGCA: Support struct expressions without intermediary anon consts #149114
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
base: main
Are you sure you want to change the base?
Conversation
|
|
0dbf003 to
a019ac7
Compare
This comment has been minimized.
This comment has been minimized.
a019ac7 to
b557322
Compare
This comment has been minimized.
This comment has been minimized.
b557322 to
734737a
Compare
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
MGCA: Support struct expressions without intermediary anon consts
This comment has been minimized.
This comment has been minimized.
| let (variant_idx, branches) = if def.is_enum() { | ||
| let (head, rest) = branches.split_first().unwrap(); | ||
| (VariantIdx::from_u32(head.unwrap_leaf().to_u32()), rest) | ||
| (VariantIdx::from_u32(head.to_value().valtree.unwrap_leaf().to_u32()), rest) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the addition of all the .to_value().valtree everywhere is kind of unfortunate
| // We need a branch for each "level" of the data structure. | ||
| let bytes = ty::ValTree::from_raw_bytes(tcx, byte_sym.as_byte_str()); | ||
| ty::ValTree::from_branches(tcx, [bytes]) | ||
| ty::ValTree::from_branches(tcx, [ty::Const::new_value(tcx, bytes, *inner_ty)]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same with all the extra calls to ty::Const::new_x
|
|
||
| let valtree = | ||
| ty::ValTree::from_branches(tcx, opt_discr_const.into_iter().chain(fields)); | ||
| ty::Const::new_value(tcx, valtree, ty) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
need to add some tests into this commit, pretty much any of the example code ive written for showing the PR to people 😆
This comment has been minimized.
This comment has been minimized.
734737a to
6496c15
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
Finished benchmarking commit (eeb4682): comparison URL. Overall result: ❌✅ regressions and improvements - please read the text belowBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. Next Steps: If you can justify the regressions found in this try perf run, please do so in sufficient writing along with @bors rollup=never Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary 1.2%, secondary 1.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (secondary -0.1%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeResults (secondary 0.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Bootstrap: 474.035s -> 472.627s (-0.30%) |
6496c15 to
1a44434
Compare
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
MGCA: Support struct expressions without intermediary anon consts
This comment has been minimized.
This comment has been minimized.
|
@bors try cancel |
|
Try build cancelled. Cancelled workflows: |
|
@bors try |
This comment has been minimized.
This comment has been minimized.
MGCA: Support struct expressions without intermediary anon consts
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
30c9d25 to
1a44434
Compare
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
Finished benchmarking commit (5d5bf97): comparison URL. Overall result: ❌✅ regressions and improvements - please read the text belowBenchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf. Next Steps: If you can justify the regressions found in this try perf run, please do so in sufficient writing along with @bors rollup=never Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary -1.0%, secondary -0.8%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (secondary 2.8%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeResults (secondary 0.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Bootstrap: 474.035s -> 474.013s (-0.00%) |
r? oli-obk
tracking issue: #132980
based on #149136
High level goal
Under
feature(min_generic_const_args)this PR adds another kind of const argument. A struct/variant construction const arg kind. We represent the values of the fields as themselves being const arguments which allows for uses of generic parameters subject to the existing restrictions present inmin_generic_const_args:This PR does not support uses of const ctors, e.g.
None. And also does not support tuple constructors, e.g.Some(N). I believe that it would not be difficult to add support for such functionality after this PR lands so have left it out deliberately.We currently require that all generic parameters on the type being constructed be explicitly specified. I haven't really looked into why that is but it doesn't seem desirable to me as it should be legal to write
Some { ... }in a const argument inside of a body and have that desugar toSome::<_> { ... }. Regardless this can definitely be a follow-up PR and I assume this is some underlying consistency with the way that elided args are handled with type paths elsewhere.This PRs implementation of supporting struct expressions is quite buggy/ICEy/incomplete. Just looking at the ty lowering logic there's immediately a bunch of panic spots where we should emit proper errors. We also don't handle
Foo { ..expr }correctly (ie at all). The printing ofConstArgKind::StructHIR nodes doesn't really exist either :')I've tried to keep the implementation here somewhat deliberately incomplete as I think a number of these issues are actually quite small and self contained after this PR lands and I'm hoping it could be a good set of issues to mentor newer contributors on 🤔 I just wanted the "bare minimum" required to actually demonstrate that the previous changes are "necessary".
ValTreenow recurse throughty::ConstIn order to actually represent struct/variant construction in
ty::Constwithout going through an anon const we would need to introduce some newConstKindvariant. Let's say some hypotheticalConstKind::ADT(Ty<'tcx>, List<Const<'tcx>>).This variant would represent things the same way that
ValTreedoes with the first element representing theVariantIdxof the enum (if its an enum), and then followed by a list of field values in definition order.This could work but there are a few reasons why it's suboptimal.
First it would mean we have a second kind of
Constthat can be normalized. Right now we only haveConstKind::Unevaluatedwhich possibly needs normalization. Similarly withTyKindwe only haveTyKind::Alias. If we introducedConstKind::ADTit would need to be normalized to aConstKind::Valueeventually. This feels to me like it has the potential to cause bugs in the long run where onlyConstKind::Unevaluatedis handled by some code paths.Secondly it would make type equality/inference be kind of... weird... It's desirable for
Some { 0: ?x } eq Some { 0: 1_u32 }to result in?x=1_u32. I can't see a way for this to work with thisConstKind::ADTdesign under the current architecture for how we represent types/consts and generally do equality operations.We would need to wholly special case these two variants in type equality and have a custom recursive walker separate from the existing architecture for doing type equality. It would also be somewhat unique in that it's a non-rigid
ty::Const(it can be normalized more later on in type inference) while also having somewhat "structural" equality behaviour.Lastly, it's worth noting that its not actually
ConstKind::ADTthat we want. It's desirable to extend this setup to also support tuples and arrays, or even references if we wind up supporting those in const generics. Therefore this isn't reallyConstKind::ADTbut a more generalConstKind::ShallowValueor something to that effect. It represents at least one "layer" of a types value :')Instead of doing this implementation choice we instead change
ValTree::Branch:The representation for so called "shallow values" is now the same as the representation for the entire full value. The desired inference/type equality behaviour just falls right out of this. We also don't wind up with these shallow values actually being non-rigid. And
ValTreealready supports references/tuples/arrays so we can handle those just fine.I think in the future it might be worth considering inlining
ValTreeintoty::ConstKind. E.g:This would imply that the usage of
ValTrees in patterns would now be usingty::Constbut they already kind of are anyway and I think that's probably okay in the long run. It also would mean that the set of things we could represent in const patterns is greater which may be desirable in the long run for supporting things such as const patterns of const generic parameters.Regardless, this PR doesn't actually inline
ValTreeintoty::ConstKind, it only changesBranchto recurse throughConst. This change could be split out of this PR if desired.I'm not sure if there'll be a perf impact from this change. It's somewhat plausible as now all const pattern values that have nesting will be interning a lot more
Tys. We shall see :>Forbidding generic parameters under mgca
Under mgca we now allow all const arguments to resolve paths to generic parameters. We then later actually validate that the const arg should be allowed to access generic parameters if it did wind up resolving to any.
This winds up just being a lot simpler to implement than trying to make name resolution "keep track" of whether we're inside of a non-anon-const const arg and then encounter a
const { ... }indicating we should now stop allowing resolving to generic parameters.It's also somewhat in line with what we'll need for a
feature(generic_const_args)where we'll want to decide whether an anon const should have any generic parameters based off syntactically whether any generic parameters were used. Though that design is entirely hypothetical at this point :)