Skip to content

Commit b33c6e1

Browse files
committed
Do not error on the param_env during inlining.
This created unexpected diagnostics while compiling alga: cannot satisfy `<Self as Module>::Ring == _` Turns out that we don't need this diagnostic as we disable inlining when it would trigger an ICE.
1 parent ce4b5c8 commit b33c6e1

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

Diff for: compiler/rustc_mir_transform/src/inline.rs

-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use rustc_index::vec::Idx;
77
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
88
use rustc_middle::mir::visit::*;
99
use rustc_middle::mir::*;
10-
use rustc_middle::traits::ObligationCause;
1110
use rustc_middle::ty::subst::Subst;
1211
use rustc_middle::ty::{self, ConstKind, Instance, InstanceDef, ParamEnv, Ty, TyCtxt};
1312
use rustc_span::{hygiene::ExpnKind, ExpnData, LocalExpnId, Span};
@@ -77,13 +76,6 @@ fn inline<'tcx>(tcx: TyCtxt<'tcx>, body: &mut Body<'tcx>) -> bool {
7776
}
7877

7978
let param_env = tcx.param_env_reveal_all_normalized(def_id);
80-
let hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
81-
let param_env = rustc_trait_selection::traits::normalize_param_env_or_error(
82-
tcx,
83-
def_id.to_def_id(),
84-
param_env,
85-
ObligationCause::misc(body.span, hir_id),
86-
);
8779

8880
let mut this = Inliner {
8981
tcx,

0 commit comments

Comments
 (0)