Bless

Author: saethlin

Cargo.lock

@@ -4207,6 +4207,7 @@ dependencies = [
 name = "rustc_monomorphize"
 version = "0.0.0"
 dependencies = [
+ "rustc_abi",
  "rustc_ast",
  "rustc_attr_data_structures",
  "rustc_data_structures",

compiler/rustc_mir_transform/messages.ftl

@@ -1,41 +1,3 @@
-mir_transform_abi_error_disabled_vector_type =
-  this function {$is_call ->
-    [true] call
-    *[false] definition
-  } uses SIMD vector type `{$ty}` which (with the chosen ABI) requires the `{$required_feature}` target feature, which is not enabled{$is_call ->
-    [true] {" "}in the caller
-    *[false] {""}
-  }
-  .label = function {$is_call ->
-    [true] called
-    *[false] defined
-  } here
-  .help = consider enabling it globally (`-C target-feature=+{$required_feature}`) or locally (`#[target_feature(enable="{$required_feature}")]`)
-
-mir_transform_abi_error_unsupported_vector_type =
-  this function {$is_call ->
-    [true] call
-    *[false] definition
-  } uses SIMD vector type `{$ty}` which is not currently supported with the chosen ABI
-  .label = function {$is_call ->
-    [true] called
-    *[false] defined
-  } here
-
-mir_transform_abi_required_target_feature =
-  this function {$is_call ->
-    [true] call
-    *[false] definition
-  } uses ABI "{$abi}" which requires the `{$required_feature}` target feature, which is not enabled{$is_call ->
-    [true] {" "}in the caller
-    *[false] {""}
-  }
-  .label = function {$is_call ->
-    [true] called
-    *[false] defined
-  } here
-  .help = consider enabling it globally (`-C target-feature=+{$required_feature}`) or locally (`#[target_feature(enable="{$required_feature}")]`)
-
 mir_transform_arithmetic_overflow = this arithmetic operation will overflow
 mir_transform_const_defined_here = `const` item defined here
 
@@ -74,11 +36,6 @@ mir_transform_force_inline_attr =
 mir_transform_force_inline_justification =
     `{$callee}` is required to be inlined to: {$sym}
 
-mir_transform_large_assignments =
-    moving {$size} bytes
-    .label = value moved from here
-    .note = The current maximum size is {$limit}, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
-
 mir_transform_must_not_suspend = {$pre}`{$def_path}`{$post} held across a suspend point, but should not be
     .label = the value is held across this suspend point
     .note = {$reason}
@@ -122,12 +79,3 @@ mir_transform_unconditional_recursion = function cannot return without recursing
 mir_transform_unconditional_recursion_call_site_label = recursive call site
 
 mir_transform_unknown_pass_name = MIR pass `{$name}` is unknown and will be ignored
-
-mir_transform_unnecessary_transmute = unnecessary transmute
-
-mir_transform_wasm_c_abi_transition =
-    this function {$is_call ->
-      [true] call
-      *[false] definition
-    } involves an argument of type `{$ty}` which is affected by the wasm ABI transition
-    .help = the "C" ABI Rust uses on wasm32-unknown-unknown will change to align with the standard "C" ABI for this target

compiler/rustc_mir_transform/src/errors.rs

@@ -2,7 +2,7 @@ use rustc_errors::codes::*;
 use rustc_errors::{Diag, LintDiagnostic};
 use rustc_macros::{Diagnostic, LintDiagnostic, Subdiagnostic};
 use rustc_middle::mir::AssertKind;
-use rustc_middle::ty::{Ty, TyCtxt};
+use rustc_middle::ty::TyCtxt;
 use rustc_session::lint::{self, Lint};
 use rustc_span::def_id::DefId;
 use rustc_span::{Ident, Span, Symbol};
@@ -117,16 +117,6 @@ pub(crate) struct FnItemRef {
     pub ident: Ident,
 }
 
-#[derive(LintDiagnostic)]
-#[diag(mir_transform_large_assignments)]
-#[note]
-pub(crate) struct LargeAssignmentsLint {
-    #[label]
-    pub span: Span,
-    pub size: u64,
-    pub limit: u64,
-}
-
 #[derive(Diagnostic)]
 #[diag(mir_transform_exceeds_mcdc_test_vector_limit)]
 pub(crate) struct MCDCExceedsTestVectorLimit {
@@ -193,49 +183,3 @@ pub(crate) struct ForceInlineFailure {
 pub(crate) struct ForceInlineJustification {
     pub sym: Symbol,
 }
-
-#[derive(Diagnostic)]
-#[diag(mir_transform_abi_error_disabled_vector_type)]
-#[help]
-pub(crate) struct AbiErrorDisabledVectorType<'a> {
-    #[primary_span]
-    #[label]
-    pub span: Span,
-    pub required_feature: &'a str,
-    pub ty: Ty<'a>,
-    /// Whether this is a problem at a call site or at a declaration.
-    pub is_call: bool,
-}
-
-#[derive(Diagnostic)]
-#[diag(mir_transform_abi_error_unsupported_vector_type)]
-pub(crate) struct AbiErrorUnsupportedVectorType<'a> {
-    #[primary_span]
-    #[label]
-    pub span: Span,
-    pub ty: Ty<'a>,
-    /// Whether this is a problem at a call site or at a declaration.
-    pub is_call: bool,
-}
-
-#[derive(Diagnostic)]
-#[diag(mir_transform_abi_required_target_feature)]
-#[help]
-pub(crate) struct AbiRequiredTargetFeature<'a> {
-    #[primary_span]
-    #[label]
-    pub span: Span,
-    pub required_feature: &'a str,
-    pub abi: &'a str,
-    /// Whether this is a problem at a call site or at a declaration.
-    pub is_call: bool,
-}
-
-#[derive(LintDiagnostic)]
-#[diag(mir_transform_wasm_c_abi_transition)]
-#[help]
-pub(crate) struct WasmCAbiTransition<'a> {
-    pub ty: Ty<'a>,
-    /// Whether this is a problem at a call site or at a declaration.
-    pub is_call: bool,
-}

compiler/rustc_mir_transform/src/lib.rs

@@ -54,7 +54,6 @@ mod errors;
 mod ffi_unwind_calls;
 mod lint;
 mod lint_tail_expr_drop_order;
-mod mono_checks;
 mod patch;
 mod shim;
 mod ssa;
@@ -214,7 +213,6 @@ pub fn provide(providers: &mut Providers) {
     ffi_unwind_calls::provide(providers);
     shim::provide(providers);
     cross_crate_inline::provide(providers);
-    mono_checks::provide(providers);
     providers.queries = query::Providers {
         mir_keys,
         mir_built,
@@ -889,8 +887,6 @@ pub fn build_codegen_mir<'tcx>(tcx: TyCtxt<'tcx>, instance: Instance<'tcx>) -> &
         body
     };
 
-    mono_checks::check_mono_item(tcx, instance, body);
-
     body
 }
 

compiler/rustc_monomorphize/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2024"
 
 [dependencies]
 # tidy-alphabetical-start
+rustc_abi = { path = "../rustc_abi" }
 rustc_ast = { path = "../rustc_ast" }
 rustc_attr_data_structures = { path = "../rustc_attr_data_structures" }
 rustc_data_structures = { path = "../rustc_data_structures" }

compiler/rustc_monomorphize/messages.ftl

@@ -1,9 +1,52 @@
+monomorphize_abi_error_disabled_vector_type =
+  this function {$is_call ->
+    [true] call
+    *[false] definition
+  } uses SIMD vector type `{$ty}` which (with the chosen ABI) requires the `{$required_feature}` target feature, which is not enabled{$is_call ->
+    [true] {" "}in the caller
+    *[false] {""}
+  }
+  .label = function {$is_call ->
+    [true] called
+    *[false] defined
+  } here
+  .help = consider enabling it globally (`-C target-feature=+{$required_feature}`) or locally (`#[target_feature(enable="{$required_feature}")]`)
+
+monomorphize_abi_error_unsupported_vector_type =
+  this function {$is_call ->
+    [true] call
+    *[false] definition
+  } uses SIMD vector type `{$ty}` which is not currently supported with the chosen ABI
+  .label = function {$is_call ->
+    [true] called
+    *[false] defined
+  } here
+
+monomorphize_abi_required_target_feature =
+  this function {$is_call ->
+    [true] call
+    *[false] definition
+  } uses ABI "{$abi}" which requires the `{$required_feature}` target feature, which is not enabled{$is_call ->
+    [true] {" "}in the caller
+    *[false] {""}
+  }
+  .label = function {$is_call ->
+    [true] called
+    *[false] defined
+  } here
+  .help = consider enabling it globally (`-C target-feature=+{$required_feature}`) or locally (`#[target_feature(enable="{$required_feature}")]`)
+
 monomorphize_couldnt_dump_mono_stats =
     unexpected error occurred while dumping monomorphization stats: {$error}
 
 monomorphize_encountered_error_while_instantiating =
     the above error was encountered while instantiating `{$formatted_item}`
 
+monomorphize_large_assignments =
+    moving {$size} bytes
+    .label = value moved from here
+    .note = The current maximum size is {$limit}, but it can be customized with the move_size_limit attribute: `#![move_size_limit = "..."]`
+
 monomorphize_no_optimized_mir =
     missing optimized MIR for `{$instance}` in the crate `{$crate_name}`
     .note = missing optimized MIR for this item (was the crate `{$crate_name}` compiled with `--emit=metadata`?)
@@ -17,4 +60,11 @@ monomorphize_start_not_found = using `fn main` requires the standard library
 
 monomorphize_symbol_already_defined = symbol `{$symbol}` is already defined
 
+monomorphize_wasm_c_abi_transition =
+    this function {$is_call ->
+      [true] call
+      *[false] definition
+    } involves an argument of type `{$ty}` which is affected by the wasm ABI transition
+    .help = the "C" ABI Rust uses on wasm32-unknown-unknown will change to align with the standard "C" ABI for this target
+
 monomorphize_written_to_path = the full type name has been written to '{$path}'

compiler/rustc_monomorphize/src/collector.rs

@@ -1232,7 +1232,7 @@ fn collect_items_of_instance<'tcx>(
     mode: CollectionMode,
 ) -> (MonoItems<'tcx>, MonoItems<'tcx>) {
     // This item is getting monomorphized, do mono-time checks.
-    //tcx.ensure_ok().check_mono_item(instance);
+    tcx.ensure_ok().check_mono_item(instance);
 
     let body = tcx.instance_mir(instance.def);
     // Naively, in "used" collection mode, all functions get added to *both* `used_items` and

compiler/rustc_monomorphize/src/errors.rs

@@ -1,6 +1,7 @@
 use std::path::PathBuf;
 
-use rustc_macros::Diagnostic;
+use rustc_macros::{Diagnostic, LintDiagnostic};
+use rustc_middle::ty::Ty;
 use rustc_span::{Span, Symbol};
 
 #[derive(Diagnostic)]
@@ -26,6 +27,16 @@ pub(crate) struct NoOptimizedMir {
     pub instance: String,
 }
 
+#[derive(LintDiagnostic)]
+#[diag(monomorphize_large_assignments)]
+#[note]
+pub(crate) struct LargeAssignmentsLint {
+    #[label]
+    pub span: Span,
+    pub size: u64,
+    pub limit: u64,
+}
+
 #[derive(Diagnostic)]
 #[diag(monomorphize_symbol_already_defined)]
 pub(crate) struct SymbolAlreadyDefined {
@@ -52,3 +63,49 @@ pub(crate) struct EncounteredErrorWhileInstantiating {
 #[diag(monomorphize_start_not_found)]
 #[help]
 pub(crate) struct StartNotFound;
+
+#[derive(Diagnostic)]
+#[diag(monomorphize_abi_error_disabled_vector_type)]
+#[help]
+pub(crate) struct AbiErrorDisabledVectorType<'a> {
+    #[primary_span]
+    #[label]
+    pub span: Span,
+    pub required_feature: &'a str,
+    pub ty: Ty<'a>,
+    /// Whether this is a problem at a call site or at a declaration.
+    pub is_call: bool,
+}
+
+#[derive(Diagnostic)]
+#[diag(monomorphize_abi_error_unsupported_vector_type)]
+pub(crate) struct AbiErrorUnsupportedVectorType<'a> {
+    #[primary_span]
+    #[label]
+    pub span: Span,
+    pub ty: Ty<'a>,
+    /// Whether this is a problem at a call site or at a declaration.
+    pub is_call: bool,
+}
+
+#[derive(Diagnostic)]
+#[diag(monomorphize_abi_required_target_feature)]
+#[help]
+pub(crate) struct AbiRequiredTargetFeature<'a> {
+    #[primary_span]
+    #[label]
+    pub span: Span,
+    pub required_feature: &'a str,
+    pub abi: &'a str,
+    /// Whether this is a problem at a call site or at a declaration.
+    pub is_call: bool,
+}
+
+#[derive(LintDiagnostic)]
+#[diag(monomorphize_wasm_c_abi_transition)]
+#[help]
+pub(crate) struct WasmCAbiTransition<'a> {
+    pub ty: Ty<'a>,
+    /// Whether this is a problem at a call site or at a declaration.
+    pub is_call: bool,
+}

compiler/rustc_monomorphize/src/lib.rs

@@ -16,6 +16,7 @@ use rustc_span::ErrorGuaranteed;
 
 mod collector;
 mod errors;
+mod mono_checks;
 mod partitioning;
 mod util;
 
@@ -50,4 +51,5 @@ fn custom_coerce_unsize_info<'tcx>(
 
 pub fn provide(providers: &mut Providers) {
     partitioning::provide(providers);
+    mono_checks::provide(providers);
 }

compiler/rustc_mir_transform/src/mono_checks/abi_check.rs renamed to compiler/rustc_monomorphize/src/mono_checks/abi_check.rs

@@ -243,7 +243,7 @@ fn check_callees_abi<'tcx>(tcx: TyCtxt<'tcx>, instance: Instance<'tcx>, body: &m
 pub(crate) fn check_feature_dependent_abi<'tcx>(
     tcx: TyCtxt<'tcx>,
     instance: Instance<'tcx>,
-    body: &mir::Body<'tcx>,
+    body: &'tcx mir::Body<'tcx>,
 ) {
     check_instance_abi(tcx, instance);
     check_callees_abi(tcx, instance, body);

compiler/rustc_mir_transform/src/mono_checks/mod.rs renamed to compiler/rustc_monomorphize/src/mono_checks/mod.rs

@@ -2,29 +2,22 @@
 //! monomorphization of all functions. This lets us implement monomorphization-time
 //! checks in a way that is friendly to incremental compilation.
 
-use rustc_middle::mir::Body;
 use rustc_middle::query::Providers;
 use rustc_middle::ty::{Instance, TyCtxt};
 
 mod abi_check;
 mod move_check;
 
-pub(super) fn check_mono_item<'tcx>(
-    tcx: TyCtxt<'tcx>,
-    instance: Instance<'tcx>,
-    body: &Body<'tcx>,
-) {
+fn check_mono_item<'tcx>(tcx: TyCtxt<'tcx>, instance: Instance<'tcx>) {
+    let body = tcx.instance_mir(instance.def);
     abi_check::check_feature_dependent_abi(tcx, instance, body);
     move_check::check_moves(tcx, instance, body);
 }
 
 pub(super) fn provide(providers: &mut Providers) {
     *providers = Providers {
+        check_mono_item,
         skip_move_check_fns: move_check::skip_move_check_fns,
-        check_mono_item: |tcx, instance| {
-            let body = tcx.codegen_mir(instance);
-            check_mono_item(tcx, instance, body)
-        },
         ..*providers
     }
 }