Skip to content

generic_const_args: allow paths to non type consts#155341

Open
khyperia wants to merge 1 commit intorust-lang:mainfrom
khyperia:non-type-const
Open

generic_const_args: allow paths to non type consts#155341
khyperia wants to merge 1 commit intorust-lang:mainfrom
khyperia:non-type-const

Conversation

@khyperia
Copy link
Copy Markdown
Contributor

@khyperia khyperia commented Apr 15, 2026

View all comments

tracking issue: #151972

Non type consts should be usable in the type system in feature(generic_const_args). These are directly plugged into the constant evaluator, unlike type consts, which are attempted to be reasoned about by the type system.

Inherent associated constants are not supported at this time, due to complications around how generic arguments are represented for them (it's currently a mess). The mess is being cleaned up (e.g. #154758), so instead of trying to hack support in before the refactoring is done, let's just wait to be able to implement it more cleanly.

r? @BoxyUwU

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 15, 2026

changes to the core type system

cc @lcnr

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

HIR ty lowering was modified

cc @fmease

changes to the core type system

cc @lcnr

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Apr 15, 2026
Copy link
Copy Markdown
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

cool ✨ two big picture things:

  1. you've changed evaluate_const to take an unevaluated const instead of a ty::Const. iirc we talked about doing this to make IACs work but since we've dropped support for them can those changes be reverted?
  2. if it would be kinda chill for you to do can you make the change of adding fields to AliasTermKind's variants be in a separate commit so it's easier to review just the "meaningful" stuff? If it's non-trivial/difficult it's fine to keep it as is 🤔

View changes since this review

Comment thread compiler/rustc_hir_analysis/src/collect/predicates_of.rs Outdated
Comment thread compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs Outdated
Comment thread compiler/rustc_next_trait_solver/src/solve/normalizes_to/free_alias.rs Outdated
Comment thread compiler/rustc_next_trait_solver/src/solve/normalizes_to/inherent.rs Outdated
Comment thread compiler/rustc_type_ir/src/predicate.rs Outdated
@khyperia
Copy link
Copy Markdown
Contributor Author

khyperia commented Apr 16, 2026

  • you've changed evaluate_const to take an unevaluated const instead of a ty::Const. iirc we talked about doing this to make IACs work but since we've dropped support for them can those changes be reverted?

yeah I guess, it just makes me sad to revert, the change seems nice :c :P - I've stashed the work so can maybe done sometime in the future

  • if it would be kinda chill for you to do can you make the change of adding fields to AliasTermKind's variants be in a separate commit so it's easier to review just the "meaningful" stuff? If it's non-trivial/difficult it's fine to keep it as is 🤔

done!

edit: ack, the split wasn't fully clean, there's a swap from is_type to pattern matching in the first commit that should be in the second commit, in normalize.rs, sowwy

edit: ok, pushed, moving the change to the other commit

cc @WaffleLapkin when AliasTermKind has been updated to store DefIds like you've done for AliasTyKind this can be removed and we can just call tcx.is_type_const(def) everywhere instead

I think the DefId is already available in all the relevant places - I don't think adding a is_type_const field is strictly necessary, I just thought it was cleaner/nicer, especially with the exhaustive pattern matching nice things. Totally reasonable for me to use tcx.is_type_const though, let me know what style you'd prefer!

@rust-bors

This comment has been minimized.

Copy link
Copy Markdown
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

I'm not super fussy about the is_type_const field I guess. It probably doesn't really change much about how much effort it'll be for one of you or waffle to fix things up between this and #155392.

I think this PR basically just needs some more tests at this point. I'm thinking off the top of my head.

  • generic uses of free consts, e.g. FREE<N> so it can't just be immediately evaluated
  • equality rules of non-type consts, so for both free and associated consts we should have tests that:
    • ALIAS1 and ALIAS2 are equal if they evalaute to the same value (and aren't if they don't).
    • ALIAS<N> is only equal to itself and not other aliases with the same body

then it should be good to go

View changes since this review

@BoxyUwU
Copy link
Copy Markdown
Member

BoxyUwU commented Apr 20, 2026

oh also can you link to the tracking issue for gca in the PR description

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Apr 22, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

// Perhaps we could split EvaluateConstErr::HasGenericsOrInfers into HasGenerics
// and HasInfers or something, and make evaluate_const_and_instantiate change
// its behavior based on that, rather than it checking `has_non_region_infer`.
let target_args = ecx.resolve_vars_if_possible(target_args);
Copy link
Copy Markdown
Contributor Author

@khyperia khyperia Apr 22, 2026

Choose a reason for hiding this comment

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

@BoxyUwU this is annoying and gross (see HACK comment), resolve_vars_if_possible is called twice on target_args. I could maybe clean this up in a follow-up PR? Or I could gut/refactor in this PR. I would slightly prefer doing it in a follow-up, but, let me know!

View changes since the review

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

we probably should split EvaluateConstErr in two eventually yeah.

Can you move this resolve_vars_if_possible into evaluate_const_and_instantiate_normalizes_to_term. Right now it kind of detracts from understanding the high level logic of how normalization works

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done!

Copy link
Copy Markdown
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

thx this looks good ✨

View changes since this review

Comment thread compiler/rustc_next_trait_solver/src/solve/normalizes_to/anon_const.rs Outdated
Comment thread compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs Outdated
Comment thread compiler/rustc_trait_selection/src/traits/project.rs Outdated
Comment thread compiler/rustc_next_trait_solver/src/solve/eval_ctxt/mod.rs
@khyperia khyperia force-pushed the non-type-const branch 4 times, most recently from ce2009d to 556ad2f Compare May 1, 2026 10:55
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented May 1, 2026

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @tshepang

@rust-log-analyzer

This comment has been minimized.

Copy link
Copy Markdown
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

do we have a test which would expose the "normalizing free alias to an infer var resulting in MIR typeck ICEs"? would be nice to add that revisioned on both old/new solver so we can show new solver working and if we allow GCA with old solver we know it also works

View changes since this review

// - the fresh vars are then used as target_args
// we need the actual args to run const eval, so we need to actually do the `eq`
// and figure out the args, so, call try_evaluate_added_goals
ecx.try_evaluate_added_goals()?;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

do you have a link to a test that requires this?

I'm wondering if it make sense to move this into evaluate_const_and_instantiate_normalizes_to_term. I don't think evaluating free consts would need this but I expect IACs will wind up needing it too. And generally it just feels kind of more principled to do so 🤔/would make the code nicer to read I think.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I could have sworn this was necessary in an earlier version of the code, but I can't for the life of me get a repro where it's necessary now. Perhaps it was only necessary with IACs, but not with projected.

I'm unable to find a repro with this line commented out:

but that line already does what the line in my PR is attempting to do, so I think it's fine to delete this line from my PR.

return;
}

// Require the new solver with GCA, because the old solver does not implement GCA correctly.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Suggested change
// Require the new solver with GCA, because the old solver does not implement GCA correctly.
// Require the new solver with GCA, because the old solver can't implement GCA correctly
// as it does not support normalization obligations for free and inherent consts.

@khyperia
Copy link
Copy Markdown
Contributor Author

khyperia commented May 1, 2026

do we have a test which would expose the "normalizing free alias to an infer var resulting in MIR typeck ICEs"?

Yes, tests/ui/const-generics/gca/ambiguous-on-failed-eval-with-vars-fail.rs is that test (specifically the test_free_mismatch function). That test used to ICE on the old solver and is the source of what we talked about of disabling the old solver on gca ✨

would be nice to add that revisioned on both old/new solver so we can show new solver working and if we allow GCA with old solver we know it also works

what do you mean by that? like, add a .old.stderr bless that's just, error: generic_const_exprs requires -Znext-solver=globally to be enabled?

@BoxyUwU
Copy link
Copy Markdown
Member

BoxyUwU commented May 1, 2026

like, add a .old.stderr bless that's just, error: generic_const_exprs requires -Znext-solver=globally to be enabled?

yeah, that way it'll change from that to incorrectly passing or something if we allow the feature in the old solver

@rustbot rustbot added the A-rustc-dev-guide Area: rustc-dev-guide label May 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-rustc-dev-guide Area: rustc-dev-guide 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants