about summary refs log tree commit diff
path: root/compiler/rustc_mir_transform/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-09-14 13:42:30 +0000
committerbors <bors@rust-lang.org>2023-09-14 13:42:30 +0000
commit5e719131567bae5b973b6adb3e3fa756a5f7eb73 (patch)
tree5a32a47e481269b3bda90b3ec169047241d780a7 /compiler/rustc_mir_transform/src
parentdf63c5f140c3c9c12678153f20e38e6f6278150f (diff)
parenta0a801cd3807498bdf6b0d7fd4148fdff9ede4b1 (diff)
downloadrust-5e719131567bae5b973b6adb3e3fa756a5f7eb73.tar.gz
rust-5e719131567bae5b973b6adb3e3fa756a5f7eb73.zip
Auto merge of #115817 - fee1-dead-contrib:fix-codegen, r=oli-obk
treat host effect params as erased in codegen

This fixes the changes brought to codegen tests when effect params are added to libcore, by not attempting to monomorphize functions that get the host param by being `const fn`.

r? `@oli-obk`
Diffstat (limited to 'compiler/rustc_mir_transform/src')
-rw-r--r--compiler/rustc_mir_transform/src/inline.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/inline.rs b/compiler/rustc_mir_transform/src/inline.rs
index 7d4c4a823a8..4dc7c3b6444 100644
--- a/compiler/rustc_mir_transform/src/inline.rs
+++ b/compiler/rustc_mir_transform/src/inline.rs
@@ -390,7 +390,12 @@ impl<'tcx> Inliner<'tcx> {
 
         // Reachability pass defines which functions are eligible for inlining. Generally inlining
         // other functions is incorrect because they could reference symbols that aren't exported.
-        let is_generic = callsite.callee.args.non_erasable_generics().next().is_some();
+        let is_generic = callsite
+            .callee
+            .args
+            .non_erasable_generics(self.tcx, callsite.callee.def_id())
+            .next()
+            .is_some();
         if !is_generic && !callee_attrs.requests_inline() {
             return Err("not exported");
         }