Skip to content

Commit

Permalink
Auto merge of #117363 - saethlin:cross-crate-inline-when-inline, r=<try>
Browse files Browse the repository at this point in the history
Enable cross-crate-inlining when MIR inlining is enabled

This would make #117355 generally less obscure, and also seems like a good idea, even if for some reason someone wants MIR opts but no codegen opts.
  • Loading branch information
bors committed Oct 29, 2023
2 parents 83c9732 + e53b18f commit 0921115
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions compiler/rustc_mir_transform/src/cross_crate_inline.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use crate::inline;
use crate::pass_manager as pm;
use rustc_attr::InlineAttr;
use rustc_hir::def::DefKind;
use rustc_hir::def_id::LocalDefId;
Expand Down Expand Up @@ -40,8 +42,11 @@ fn cross_crate_inlinable(tcx: TyCtxt<'_>, def_id: LocalDefId) -> bool {
return false;
}

// Don't do any inference unless optimizations are enabled.
if matches!(tcx.sess.opts.optimize, OptLevel::No) {
// Don't do any inference if codegen optimizations are disabled and also MIR inlining is not
// enabled. This ensures that we do inference even if someone only passes -Zinline-mir,
// which is less confusing than having to also enable -Copt-level=1.
if matches!(tcx.sess.opts.optimize, OptLevel::No) && !pm::should_run_pass(tcx, &inline::Inline)
{
return false;
}

Expand Down

0 comments on commit 0921115

Please sign in to comment.