diff options
| author | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-10-29 21:46:25 +0200 |
|---|---|---|
| committer | Eduard-Mihai Burtescu <edy.burt@gmail.com> | 2019-12-03 15:41:56 +0200 |
| commit | 052d0edbc1c2572ba735ef911a5ab7e9c2a703bc (patch) | |
| tree | 69fd9047f0ed41e79040271959d202277bcf414d /src/librustc_codegen_llvm | |
| parent | 39e50e2f289a58a46f46044d8e9d296b9e7ac7e6 (diff) | |
| download | rust-052d0edbc1c2572ba735ef911a5ab7e9c2a703bc.tar.gz rust-052d0edbc1c2572ba735ef911a5ab7e9c2a703bc.zip | |
rustc: compute FnAbi's for virtual calls through FnAbi::of_instance.
Diffstat (limited to 'src/librustc_codegen_llvm')
| -rw-r--r-- | src/librustc_codegen_llvm/callee.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/mono_item.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_codegen_llvm/callee.rs b/src/librustc_codegen_llvm/callee.rs index b6a3bf2f878..74f4970333c 100644 --- a/src/librustc_codegen_llvm/callee.rs +++ b/src/librustc_codegen_llvm/callee.rs @@ -40,7 +40,7 @@ pub fn get_fn( let sym = tcx.symbol_name(instance).name.as_str(); debug!("get_fn({:?}: {:?}) => {}", instance, instance.ty(cx.tcx()), sym); - let fn_abi = FnAbi::of_instance(cx, instance); + let fn_abi = FnAbi::of_instance(cx, instance, &[]); let llfn = if let Some(llfn) = cx.get_declared_value(&sym) { // Create a fn pointer with the new signature. diff --git a/src/librustc_codegen_llvm/mono_item.rs b/src/librustc_codegen_llvm/mono_item.rs index 3d2f6efb072..75a4a966694 100644 --- a/src/librustc_codegen_llvm/mono_item.rs +++ b/src/librustc_codegen_llvm/mono_item.rs @@ -43,7 +43,7 @@ impl PreDefineMethods<'tcx> for CodegenCx<'ll, 'tcx> { assert!(!instance.substs.needs_infer() && !instance.substs.has_param_types()); - let fn_abi = FnAbi::of_instance(self, instance); + let fn_abi = FnAbi::of_instance(self, instance, &[]); let lldecl = self.declare_fn(symbol_name, &fn_abi); unsafe { llvm::LLVMRustSetLinkage(lldecl, base::linkage_to_llvm(linkage)) }; let attrs = self.tcx.codegen_fn_attrs(instance.def_id()); |
