nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-23 07:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not ICE when failing to normalize during inlining.

Browse Source
This commit is contained in:
Camille GILLOT 2022-06-03 18:44:46 +02:00
parent 9d1aeaeb82
commit 2e301c89c7
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/rustc_mir_transform/src/inline.rs
View File

@ -157,11 +157,13 @@ impl<'tcx> Inliner<'tcx> {
return Err("optimization fuel exhausted"); return Err("optimization fuel exhausted");
} }
let callee_body = callsite.callee.subst_mir_and_normalize_erasing_regions( let Ok(callee_body) = callsite.callee.try_subst_mir_and_normalize_erasing_regions(
self.tcx, self.tcx,
self.param_env, self.param_env,
callee_body.clone(), callee_body.clone(),
); ) else {
return Err("failed to normalize callee body");
};
let old_blocks = caller_body.basic_blocks().next_index(); let old_blocks = caller_body.basic_blocks().next_index();
self.inline_call(caller_body, &callsite, callee_body); self.inline_call(caller_body, &callsite, callee_body);
@ -252,7 +254,7 @@ impl<'tcx> Inliner<'tcx> {
let func_ty = func.ty(caller_body, self.tcx); let func_ty = func.ty(caller_body, self.tcx);
if let ty::FnDef(def_id, substs) = *func_ty.kind() { if let ty::FnDef(def_id, substs) = *func_ty.kind() {
// To resolve an instance its substs have to be fully normalized. // To resolve an instance its substs have to be fully normalized.
let substs = self.tcx.normalize_erasing_regions(self.param_env, substs); let substs = self.tcx.try_normalize_erasing_regions(self.param_env, substs).ok()?;
let callee = let callee =
Instance::resolve(self.tcx, self.param_env, def_id, substs).ok().flatten()?; Instance::resolve(self.tcx, self.param_env, def_id, substs).ok().flatten()?;
@ -407,14 +409,17 @@ impl<'tcx> Inliner<'tcx> {
if let ty::FnDef(def_id, substs) = if let ty::FnDef(def_id, substs) =
*callsite.callee.subst_mir(self.tcx, &f.literal.ty()).kind() *callsite.callee.subst_mir(self.tcx, &f.literal.ty()).kind()
{ {
let substs = self.tcx.normalize_erasing_regions(self.param_env, substs); if let Ok(substs) =
if let Ok(Some(instance)) = self.tcx.try_normalize_erasing_regions(self.param_env, substs)
Instance::resolve(self.tcx, self.param_env, def_id, substs)
{ {
if callsite.callee.def_id() == instance.def_id() { if let Ok(Some(instance)) =
return Err("self-recursion"); Instance::resolve(self.tcx, self.param_env, def_id, substs)
} else if self.history.contains(&instance) { {
return Err("already inlined"); if callsite.callee.def_id() == instance.def_id() {
return Err("self-recursion");
} else if self.history.contains(&instance) {
return Err("already inlined");
}
} }
} }
// Don't give intrinsics the extra penalty for calls // Don't give intrinsics the extra penalty for calls

24
src/test/ui/traits/issue-97695-double-trivial-bound.rs Normal file
View File

@ -0,0 +1,24 @@
// compile-flags: -Zinline-mir --emit=mir
// build-pass
pub trait Associate {
type Associated;
}
pub struct Wrap<'a> {
pub field: &'a i32,
}
pub trait Create<T> {
fn create() -> Self;
}
pub fn oh_no<'a, T>()
where
Wrap<'a>: Associate,
<Wrap<'a> as Associate>::Associated: Create<T>,
{
<Wrap<'a> as Associate>::Associated::create();
}
pub fn main() {}