diff options
| author | bors <bors@rust-lang.org> | 2024-02-13 00:31:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-13 00:31:53 +0000 |
| commit | 0a5b998c57a8681acc13206b5917340b053b3a30 (patch) | |
| tree | d673efacffd4baf86b67a6d9e2e511a1d2db8888 /compiler/rustc_mir_transform/src/inline/cycle.rs | |
| parent | 74c3f5a146860c94ff4d179fc3bfa34f879adf41 (diff) | |
| parent | 8a87cdacb15d4856e60388d456449158e3f542b6 (diff) | |
| download | rust-0a5b998c57a8681acc13206b5917340b053b3a30.tar.gz rust-0a5b998c57a8681acc13206b5917340b053b3a30.zip | |
Auto merge of #120991 - matthiaskrgr:rollup-f8kw2st, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #118983 (Warn on references casting to bigger memory layout) - #119451 (Gate PR CI on clippy correctness lints) - #120273 (compiletest: few naive improvements) - #120950 (Fix async closures in CTFE) - #120958 (Dejargonize `subst`) - #120965 (Add lahfsahf and prfchw target feature) - #120970 (add another test for promoteds-in-static) - #120979 (Update books) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src/inline/cycle.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/inline/cycle.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/inline/cycle.rs b/compiler/rustc_mir_transform/src/inline/cycle.rs index 5b03bc361dd..f2b6dcac586 100644 --- a/compiler/rustc_mir_transform/src/inline/cycle.rs +++ b/compiler/rustc_mir_transform/src/inline/cycle.rs @@ -80,7 +80,7 @@ pub(crate) fn mir_callgraph_reachable<'tcx>( } // These have no own callable MIR. InstanceDef::Intrinsic(_) | InstanceDef::Virtual(..) => continue, - // These have MIR and if that MIR is inlined, substituted and then inlining is run + // These have MIR and if that MIR is inlined, instantiated and then inlining is run // again, a function item can end up getting inlined. Thus we'll be able to cause // a cycle that way InstanceDef::VTableShim(_) @@ -95,7 +95,7 @@ pub(crate) fn mir_callgraph_reachable<'tcx>( // This shim does not call any other functions, thus there can be no recursion. InstanceDef::FnPtrAddrShim(..) => continue, InstanceDef::DropGlue(..) => { - // FIXME: A not fully substituted drop shim can cause ICEs if one attempts to + // FIXME: A not fully instantiated drop shim can cause ICEs if one attempts to // have its MIR built. Likely oli-obk just screwed up the `ParamEnv`s, so this // needs some more analysis. if callee.has_param() { |