diff options
| author | Camille GILLOT <gillot.camille@gmail.com> | 2021-05-11 22:05:54 +0200 |
|---|---|---|
| committer | Camille GILLOT <gillot.camille@gmail.com> | 2021-06-20 11:52:51 +0200 |
| commit | 6a371d2c8939c3a32ff0da69eb66b271ffa58288 (patch) | |
| tree | 2179683d40b533739caf3ded086d3bf0e5c7d9c6 /compiler/rustc_codegen_ssa | |
| parent | 9543636cd6609cd2a9880da8f93aac96192ae40a (diff) | |
| download | rust-6a371d2c8939c3a32ff0da69eb66b271ffa58288.tar.gz rust-6a371d2c8939c3a32ff0da69eb66b271ffa58288.zip | |
Make allocator_kind a query.
Diffstat (limited to 'compiler/rustc_codegen_ssa')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/symbol_export.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/base.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs index b2ecc3b0f32..8a035e62e2a 100644 --- a/compiler/rustc_codegen_ssa/src/back/symbol_export.rs +++ b/compiler/rustc_codegen_ssa/src/back/symbol_export.rs @@ -180,7 +180,7 @@ fn exported_symbols_provider_local( symbols.push((exported_symbol, SymbolExportLevel::C)); } - if tcx.allocator_kind().is_some() { + if tcx.allocator_kind(()).is_some() { for method in ALLOCATOR_METHODS { let symbol_name = format!("__rust_{}", method.name); let exported_symbol = ExportedSymbol::NoDefId(SymbolName::new(tcx, &symbol_name)); diff --git a/compiler/rustc_codegen_ssa/src/base.rs b/compiler/rustc_codegen_ssa/src/base.rs index 38ab39febe0..31ae84f4ca1 100644 --- a/compiler/rustc_codegen_ssa/src/base.rs +++ b/compiler/rustc_codegen_ssa/src/base.rs @@ -518,7 +518,7 @@ pub fn codegen_crate<B: ExtraBackendMethods>( }); let allocator_module = if any_dynamic_crate { None - } else if let Some(kind) = tcx.allocator_kind() { + } else if let Some(kind) = tcx.allocator_kind(()) { let llmod_id = cgu_name_builder.build_cgu_name(LOCAL_CRATE, &["crate"], Some("allocator")).to_string(); let mut modules = backend.new_metadata(tcx, &llmod_id); |
