@@ -797,42 +797,44 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> {
797797 // passes are timed inside typeck
798798 rustc_hir_analysis:: check_crate ( tcx) ?;
799799
800- parallel ! (
801- {
802- tcx. ensure( ) . effective_visibilities( ( ) ) ;
803- } ,
804- {
805- sess. time( "MIR_borrow_checking" , || {
806- tcx. hir( ) . par_body_owners( |def_id| tcx. ensure( ) . mir_borrowck( def_id) ) ;
807- } ) ;
808- } ,
809- {
810- sess. time( "MIR_effect_checking" , || {
811- for def_id in tcx. hir( ) . body_owners( ) {
812- tcx. ensure( ) . thir_check_unsafety( def_id) ;
813- if !tcx. sess. opts. unstable_opts. thir_unsafeck {
814- rustc_mir_transform:: check_unsafety:: check_unsafety( tcx, def_id) ;
815- }
816- tcx. ensure( ) . has_ffi_unwind_calls( def_id) ;
817-
818- // If we need to codegen, ensure that we emit all errors from
819- // `mir_drops_elaborated_and_const_checked` now, to avoid discovering
820- // them later during codegen.
821- if tcx. sess. opts. output_types. should_codegen( )
822- || tcx. hir( ) . body_const_context( def_id) . is_some( )
823- {
824- tcx. ensure( ) . mir_drops_elaborated_and_const_checked( def_id) ;
825- tcx. ensure( )
826- . unused_generic_params( ty:: InstanceDef :: Item ( def_id. to_def_id( ) ) ) ;
800+ sess. time ( "misc_checking_2" , || {
801+ parallel ! (
802+ {
803+ tcx. ensure( ) . effective_visibilities( ( ) ) ;
804+ } ,
805+ {
806+ sess. time( "MIR_borrow_checking" , || {
807+ tcx. hir( ) . par_body_owners( |def_id| tcx. ensure( ) . mir_borrowck( def_id) ) ;
808+ } ) ;
809+ } ,
810+ {
811+ sess. time( "MIR_effect_checking" , || {
812+ for def_id in tcx. hir( ) . body_owners( ) {
813+ tcx. ensure( ) . thir_check_unsafety( def_id) ;
814+ if !tcx. sess. opts. unstable_opts. thir_unsafeck {
815+ rustc_mir_transform:: check_unsafety:: check_unsafety( tcx, def_id) ;
816+ }
817+ tcx. ensure( ) . has_ffi_unwind_calls( def_id) ;
818+
819+ // If we need to codegen, ensure that we emit all errors from
820+ // `mir_drops_elaborated_and_const_checked` now, to avoid discovering
821+ // them later during codegen.
822+ if tcx. sess. opts. output_types. should_codegen( )
823+ || tcx. hir( ) . body_const_context( def_id) . is_some( )
824+ {
825+ tcx. ensure( ) . mir_drops_elaborated_and_const_checked( def_id) ;
826+ tcx. ensure( )
827+ . unused_generic_params( ty:: InstanceDef :: Item ( def_id. to_def_id( ) ) ) ;
828+ }
827829 }
828- }
829- } ) ;
830- } ,
831- {
832- sess. time( "layout_testing " , || layout_test :: test_layout ( tcx) ) ;
833- sess . time ( "abi_testing" , || abi_test :: test_abi ( tcx ) ) ;
834- }
835- ) ;
830+ } ) ;
831+ } ,
832+ {
833+ sess . time ( "layout_testing" , || layout_test :: test_layout ( tcx ) ) ;
834+ sess. time( "abi_testing " , || abi_test :: test_abi ( tcx) ) ;
835+ }
836+ )
837+ } ) ;
836838
837839 if tcx. sess . opts . unstable_opts . drop_tracking_mir {
838840 tcx. hir ( ) . par_body_owners ( |def_id| {
0 commit comments