[WIP] mgca: Add ConstArg representation for const items #139558

camelid · 2025-04-08T21:49:58Z

compiler/rustc_ast_lowering/src/item.rs

bors · 2025-05-21T23:47:42Z

☔ The latest upstream changes (presumably #141343) made this pull request unmergeable. Please resolve the merge conflicts.

compiler/rustc_resolve/src/def_collector.rs

compiler/rustc_hir_analysis/src/lib.rs

compiler/rustc_hir_analysis/src/collect/type_of.rs

compiler/rustc_hir_analysis/src/collect/predicates_of.rs

compiler/rustc_middle/src/query/mod.rs

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

compiler/rustc_ty_utils/src/instance.rs

BoxyUwU · 2025-05-23T22:46:33Z

@oli-obk I've assigned you to this PR alongside me because I'd definitely want you to review it before it lands since its so CTFE involved 🤔 I don't think it needs reviewing rn though, things are so up in the air and we're not bootstrapping yet :3

BoxyUwU · 2025-10-13T21:01:00Z

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

        )? {
            TypeRelativePath::AssocItem(def_id, args) => {
-                if !tcx.associated_item(def_id).is_type_const_capable(tcx) {
+                if !find_attr!(self.tcx().get_all_attrs(def_id), AttributeKind::TypeConst(_)) {


I don't know why find_attr! works here but tcx.has_attr(sym::type_const) doesnt. cc @jdonszelmann does has_attr work with new style attributes?

https://doc.rust-lang.org/stable/nightly-rustc/src/rustc_hir/hir.rs.html#1283 seems like no new style attributes don't work with has_attr if it's been parsed

it works sometimes though because we added has_attr calls in some places to fix ICEs which worked.

edit: ah no it probably just made that code unreachable lmao

BoxyUwU · 2025-10-13T21:24:50Z

compiler/rustc_ast/src/ast.rs

    pub generics: Generics,
    pub ty: Box<Ty>,
-    pub expr: Option<Box<Expr>>,
+    pub body: Option<ConstItemRhs>,


Suggested change

pub body: Option<ConstItemRhs>,

pub rhs: Option<ConstItemRhs>,

body terminology doesn't make too much sense since it's only sometimes a body

compiler/rustc_const_eval/src/check_consts/qualifs.rs

compiler/rustc_const_eval/src/const_eval/valtrees.rs

BoxyUwU · 2025-10-13T21:29:20Z

compiler/rustc_hir/src/hir.rs

    Static(Mutability, Ident, &'hir Ty<'hir>, BodyId),
    /// A `const` item.
-    Const(Ident, &'hir Generics<'hir>, &'hir Ty<'hir>, BodyId),
+    // TODO: make sure we only allow usage of path RHS in generic contexts under mgca, not stable!


This is now done, uncertain whether we may want some kind of ast validator or hir visitor to assert this :3

compiler/rustc_hir_analysis/src/collect.rs

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

compiler/rustc_lint/src/context.rs

compiler/rustc_middle/src/mir/interpret/queries.rs

compiler/rustc_trait_selection/src/traits/normalize.rs

compiler/rustc_trait_selection/src/traits/project.rs

compiler/rustc_hir_analysis/src/collect/type_of.rs

The tcx.parent tree appears to be correct now.

They need an extra branch for the newtype.

bors · 2025-10-17T11:35:15Z

☔ The latest upstream changes (presumably #147779) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot assigned BoxyUwU Apr 8, 2025

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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 8, 2025

camelid 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 8, 2025

This comment has been minimized.

Sign in to view

camelid force-pushed the mgca-const-items branch from fa42f86 to 6054bd5 Compare April 9, 2025 16:14

This comment has been minimized.

Sign in to view

camelid force-pushed the mgca-const-items branch from ac73a4a to 4f6c9ab Compare April 28, 2025 22:04

camelid commented Apr 28, 2025

View reviewed changes

compiler/rustc_ast_lowering/src/item.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

camelid force-pushed the mgca-const-items branch from 4f6c9ab to a46aa4c Compare May 15, 2025 12:37

This comment has been minimized.

Sign in to view

rustbot added the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label May 15, 2025

This comment has been minimized.

Sign in to view

camelid added A-const-generics Area: const generics (parameters and arguments) F-min_generic_const_args `#![feature(min_generic_const_args)]` labels May 17, 2025

This comment has been minimized.

Sign in to view

BoxyUwU reviewed May 22, 2025

View reviewed changes

compiler/rustc_resolve/src/def_collector.rs Outdated Show resolved Hide resolved

BoxyUwU reviewed May 22, 2025

View reviewed changes

compiler/rustc_hir_analysis/src/lib.rs Outdated Show resolved Hide resolved

BoxyUwU reviewed May 23, 2025

View reviewed changes

compiler/rustc_hir_analysis/src/collect/type_of.rs Outdated Show resolved Hide resolved

compiler/rustc_hir_analysis/src/collect/predicates_of.rs Outdated Show resolved Hide resolved

BoxyUwU reviewed May 23, 2025

View reviewed changes

compiler/rustc_middle/src/query/mod.rs Show resolved Hide resolved

BoxyUwU reviewed May 23, 2025

View reviewed changes

compiler/rustc_const_eval/src/const_eval/eval_queries.rs Outdated Show resolved Hide resolved

compiler/rustc_ty_utils/src/instance.rs Outdated Show resolved Hide resolved

BoxyUwU assigned oli-obk May 23, 2025

This comment has been minimized.

Sign in to view

rustbot added the A-attributes Area: Attributes (`#[…]`, `#![…]`) label Oct 13, 2025

BoxyUwU reviewed Oct 13, 2025

View reviewed changes

This comment has been minimized.

Sign in to view

BoxyUwU reviewed Oct 13, 2025

View reviewed changes

BoxyUwU force-pushed the mgca-const-items branch from 200e7a1 to 43a38ab Compare October 14, 2025 02:47

This comment has been minimized.

Sign in to view

BoxyUwU force-pushed the mgca-const-items branch from 43a38ab to f21c74e Compare October 14, 2025 02:56

This comment has been minimized.

Sign in to view

BoxyUwU reviewed Oct 14, 2025

View reviewed changes

compiler/rustc_hir_analysis/src/collect/type_of.rs Outdated Show resolved Hide resolved

BoxyUwU force-pushed the mgca-const-items branch from f21c74e to 277c69a Compare October 14, 2025 06:30

This comment has been minimized.

Sign in to view

camelid force-pushed the mgca-const-items branch 2 times, most recently from d90be38 to 1fa596e Compare October 16, 2025 11:04

This comment has been minimized.

Sign in to view

camelid and others added 10 commits October 16, 2025 07:30

Remove parent def lookup hack that is no longer needed

636960c

The tcx.parent tree appears to be correct now.

Fix lowering of CStr constants to valtrees

a4086bc

They need an extra branch for the newtype.

setup canonical normalization for const norm

f40520e

add ConstArgKind::Error

8d660c6

mgca: Add ConstArg representation for const items

8dbdfe0

add const_of_item query and use it in normalization

47e34cd

Fix const qualifs under mgca

d3b8075

fix associated_const_equality tests

8e79b35

use right span for inferrable ret ty

86f9105

Fix new associated_const_equality test

483b137

camelid force-pushed the mgca-const-items branch from 0b3f8e9 to 483b137 Compare October 16, 2025 11:35

This comment has been minimized.

Sign in to view

Fix rustdoc

a59dd4c

	pub body: Option<ConstItemRhs>,
	pub rhs: Option<ConstItemRhs>,

[WIP] mgca: Add ConstArg representation for const items #139558

Are you sure you want to change the base?

[WIP] mgca: Add ConstArg representation for const items #139558

Conversation

camelid commented Apr 8, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented May 21, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BoxyUwU commented May 23, 2025

Uh oh!

This comment has been minimized.

BoxyUwU Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

BoxyUwU Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

BoxyUwU Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

BoxyUwU Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

BoxyUwU Oct 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Oct 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

BoxyUwU Oct 13, 2025 •

edited

Loading

BoxyUwU Oct 13, 2025 •

edited

Loading