diff options
| author | CohenArthur <arthur.cohen@epita.fr> | 2020-08-22 16:14:33 +0200 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@epita.fr> | 2020-08-22 16:14:33 +0200 |
| commit | 4cb2a2b793f3fd3cbfce976eeb3a1fbfbf37e7b2 (patch) | |
| tree | b74b9d61c54b10e1684e4ea099ea0aa55a7107b2 /src | |
| parent | 429e75fe4007835e60e76bff38ed5d97cd134af3 (diff) | |
| download | rust-4cb2a2b793f3fd3cbfce976eeb3a1fbfbf37e7b2.tar.gz rust-4cb2a2b793f3fd3cbfce976eeb3a1fbfbf37e7b2.zip | |
FunctionCx: Fix field usage in inline_asm and vtable modules
Diffstat (limited to 'src')
| -rw-r--r-- | src/inline_asm.rs | 2 | ||||
| -rw-r--r-- | src/vtable.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/inline_asm.rs b/src/inline_asm.rs index 45ade1f7a0b..f0ae0854f84 100644 --- a/src/inline_asm.rs +++ b/src/inline_asm.rs @@ -73,7 +73,7 @@ pub(crate) fn codegen_inline_asm<'tcx>( let asm_name = format!("{}__inline_asm_{}", fx.codegen_cx.tcx.symbol_name(fx.instance).name, inline_asm_index); let generated_asm = generate_asm_wrapper(&asm_name, InlineAsmArch::X86_64, options, template, clobbered_regs, &inputs, &outputs); - fx.global_asm.push_str(&generated_asm); + fx.codegen_cx.global_asm.push_str(&generated_asm); call_inline_asm(fx, &asm_name, slot_size, inputs, outputs); } diff --git a/src/vtable.rs b/src/vtable.rs index f4d3a303bd3..6be801c8445 100644 --- a/src/vtable.rs +++ b/src/vtable.rs @@ -72,11 +72,11 @@ pub(crate) fn get_vtable<'tcx>( layout: TyAndLayout<'tcx>, trait_ref: Option<ty::PolyExistentialTraitRef<'tcx>>, ) -> Value { - let data_id = if let Some(data_id) = fx.vtables.get(&(layout.ty, trait_ref)) { + let data_id = if let Some(data_id) = fx.codegen_cx.vtables.get(&(layout.ty, trait_ref)) { *data_id } else { let data_id = build_vtable(fx, layout, trait_ref); - fx.vtables.insert((layout.ty, trait_ref), data_id); + fx.codegen_cx.vtables.insert((layout.ty, trait_ref), data_id); data_id }; @@ -142,7 +142,7 @@ fn build_vtable<'tcx>( .map(|trait_ref| format!("{:?}", trait_ref.skip_binder()).into()) .unwrap_or(std::borrow::Cow::Borrowed("???")), layout.ty, - fx.vtables.len(), + fx.codegen_cx.vtables.len(), ), Linkage::Local, false, |