nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-15 05:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip on lowering as const blocks

Browse Source
This commit is contained in:
Noah Lev 2025-04-10 23:07:40 -04:00
parent 0cea2c1fa5
commit 4a0cca3a38
2 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
compiler/rustc_ast_lowering/src/item.rs
View File

@ -500,16 +500,11 @@ impl<'hir> LoweringContext<'_, 'hir> {
span: Span,
body: Option<&Expr>,
) -> (hir::BodyId, Option<&'hir hir::ConstArg<'hir>>) {
let ct_arg = if self.tcx.features().min_generic_const_args()
&& let Some(expr) = body
{
self.try_lower_as_const_path(expr)
} else {
None
};
let body_id = if body.is_some() && ct_arg.is_none() {
// TODO: lower as const block instead
self.lower_const_body(span, body)
let mgca = self.tcx.features().min_generic_const_args();
let ct_arg =
if mgca && let Some(expr) = body { self.try_lower_as_const_path(expr) } else { None };
let body_id = if mgca && ct_arg.is_none() {
self.lower_const_body_with_const_block(span, body)
} else {
self.lower_const_body(span, body)
};
@ -1292,6 +1287,39 @@ impl<'hir> LoweringContext<'_, 'hir> {
self.lower_fn_body(decl, contract, |this| this.lower_block_expr(body))
}
/// HACK(mgca): lower the body of the const item as a const block
/// we need this later to be able to control generics in the body
/// separately from the const's type, etc.
pub(super) fn lower_const_body_with_const_block(
&mut self,
span: Span,
expr: Option<&Expr>,
) -> hir::BodyId {
self.lower_body(|this| {
(
&[],
match expr {
Some(expr) => {
let def_id = this.local_def_id(expr.id);
// TODO: somehow avoid reusing the same nodeid for the const block and the body expr
let hir_id = this.lower_node_id(expr.id);
let block = hir::ConstBlock {
def_id,
hir_id,
body: this.lower_const_body(expr.span, Some(expr)),
};
hir::Expr {
hir_id,
span: this.lower_span(expr.span),
kind: hir::ExprKind::ConstBlock(block),
}
}
None => this.expr_err(span, this.dcx().span_delayed_bug(span, "no block")),
},
)
})
}
pub(super) fn lower_const_body(&mut self, span: Span, expr: Option<&Expr>) -> hir::BodyId {
self.lower_body(|this| {
(

16
compiler/rustc_resolve/src/def_collector.rs
View File

@ -174,6 +174,12 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
);
}
}
// HACK(mgca): see lower_const_body_with_const_block in ast_lowering
ItemKind::Const(box ConstItem { expr: Some(ref expr), .. })
if this.resolver.tcx.features().min_generic_const_args() =>
{
this.create_def(expr.id, None, DefKind::InlineConst, i.span);
}
_ => {}
}
visit::walk_item(this, i);
@ -334,7 +340,15 @@ impl<'a, 'ra, 'tcx> visit::Visitor<'a> for DefCollector<'a, 'ra, 'tcx> {
};
let def = self.create_def(i.id, Some(ident.name), def_kind, i.span);
self.with_parent(def, |this| visit::walk_assoc_item(this, i, ctxt));
self.with_parent(def, |this| {
// HACK(mgca): see lower_const_body_with_const_block in ast_lowering
if let AssocItemKind::Const(box ConstItem { expr: Some(expr), .. }) = &i.kind
&& this.resolver.tcx.features().min_generic_const_args()
{
this.create_def(expr.id, None, DefKind::InlineConst, i.span);
}
visit::walk_assoc_item(this, i, ctxt)
});
}
fn visit_pat(&mut self, pat: &'a Pat) {