mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only avoid anon consts during instantiation

Browse Source
This commit is contained in:
Oli Scherer 2024-04-10 04:49:27 +00:00
parent 1512d06be9
commit 1cbe92716f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/rustc_smir/src/rustc_smir/builder.rs
View File

@ -4,6 +4,7 @@
//! monomorphic body using internal representation. //! monomorphic body using internal representation.
//! After that, we convert the internal representation into a stable one. //! After that, we convert the internal representation into a stable one.
use crate::rustc_smir::{Stable, Tables}; use crate::rustc_smir::{Stable, Tables};
use rustc_hir::def::DefKind;
use rustc_middle::mir; use rustc_middle::mir;
use rustc_middle::mir::visit::MutVisitor; use rustc_middle::mir::visit::MutVisitor;
use rustc_middle::ty::{self, TyCtxt}; use rustc_middle::ty::{self, TyCtxt};
@ -29,10 +30,12 @@ impl<'tcx> BodyBuilder<'tcx> {
/// All constants are also evaluated. /// All constants are also evaluated.
pub fn build(mut self, tables: &mut Tables<'tcx>) -> stable_mir::mir::Body { pub fn build(mut self, tables: &mut Tables<'tcx>) -> stable_mir::mir::Body {
let body = tables.tcx.instance_mir(self.instance.def).clone(); let body = tables.tcx.instance_mir(self.instance.def).clone();
let mono_body = if self.tcx.def_kind(self.instance.def_id()).is_fn_like() let mono_body = if !self.instance.args.is_empty()
|| !self.instance.args.is_empty() // Without the `generic_const_exprs` feature gate, anon consts in signatures do not
// get generic parameters. Which is wrong, but also not a problem without
// generic_const_exprs
|| self.tcx.def_kind(self.instance.def_id()) != DefKind::AnonConst
{ {
// This call will currently will ICE in some shims which are already monomorphic.
let mut mono_body = self.instance.instantiate_mir_and_normalize_erasing_regions( let mut mono_body = self.instance.instantiate_mir_and_normalize_erasing_regions(
tables.tcx, tables.tcx,
ty::ParamEnv::reveal_all(), ty::ParamEnv::reveal_all(),