@@ -62,7 +62,6 @@ pub(crate) struct OngoingCodegen {
62
62
modules : Vec < OngoingModuleCodegen > ,
63
63
allocator_module : Option < CompiledModule > ,
64
64
metadata_module : Option < CompiledModule > ,
65
- metadata : EncodedMetadata ,
66
65
crate_info : CrateInfo ,
67
66
concurrency_limiter : ConcurrencyLimiter ,
68
67
}
@@ -135,7 +134,6 @@ impl OngoingCodegen {
135
134
modules,
136
135
allocator_module : self . allocator_module ,
137
136
metadata_module : self . metadata_module ,
138
- metadata : self . metadata ,
139
137
crate_info : self . crate_info ,
140
138
} ;
141
139
@@ -706,11 +704,7 @@ fn emit_allocator_module(tcx: TyCtxt<'_>) -> Option<CompiledModule> {
706
704
}
707
705
}
708
706
709
- pub ( crate ) fn run_aot (
710
- tcx : TyCtxt < ' _ > ,
711
- metadata : EncodedMetadata ,
712
- need_metadata_module : bool ,
713
- ) -> Box < OngoingCodegen > {
707
+ pub ( crate ) fn run_aot ( tcx : TyCtxt < ' _ > , metadata : Option < & EncodedMetadata > ) -> Box < OngoingCodegen > {
714
708
// FIXME handle `-Ctarget-cpu=native`
715
709
let target_cpu = match tcx. sess . opts . cg . target_cpu {
716
710
Some ( ref name) => name,
@@ -727,7 +721,6 @@ pub(crate) fn run_aot(
727
721
modules : vec ! [ ] ,
728
722
allocator_module : None ,
729
723
metadata_module : None ,
730
- metadata,
731
724
crate_info : CrateInfo :: new ( tcx, target_cpu) ,
732
725
concurrency_limiter : ConcurrencyLimiter :: new ( 0 ) ,
733
726
} ) ;
@@ -787,14 +780,12 @@ pub(crate) fn run_aot(
787
780
788
781
let allocator_module = emit_allocator_module ( tcx) ;
789
782
790
- let metadata_module =
791
- if need_metadata_module { Some ( emit_metadata_module ( tcx, & metadata) ) } else { None } ;
783
+ let metadata_module = metadata. map ( |metadata| emit_metadata_module ( tcx, metadata) ) ;
792
784
793
785
Box :: new ( OngoingCodegen {
794
786
modules,
795
787
allocator_module,
796
788
metadata_module,
797
- metadata,
798
789
crate_info : CrateInfo :: new ( tcx, target_cpu) ,
799
790
concurrency_limiter : concurrency_limiter. 0 ,
800
791
} )
0 commit comments