rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Get rid of native_library projection queries

Browse Source 
They don't seem particularly useful as I don't expect
native libraries to change frequently.
This commit is contained in:
nils
2022-10-18 16:55:32 +02:00
parent d7dd01fe8b
commit ccc54613c3
7 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/rustc_codegen_llvm/src/callee.rs
View File

@@ -179,7 +179,8 @@ pub fn get_fn<'ll, 'tcx>(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'tcx>) ->
// MinGW: For backward compatibility we rely on the linker to decide whether it
// should use dllimport for functions.
if cx.use_dll_storage_attrs
&& tcx.is_dllimport_foreign_item(instance_def_id)
&& let Some(library) = tcx.native_library(instance_def_id)
&& library.kind.is_dllimport()
&& !matches!(tcx.sess.target.env.as_ref(), "gnu" | "uclibc")
{
llvm::LLVMSetDLLStorageClass(llfn, llvm::DLLStorageClass::DllImport);

5
compiler/rustc_codegen_llvm/src/consts.rs
View File

@@ -332,7 +332,10 @@ impl<'ll> CodegenCx<'ll, '_> {
}
}
if self.use_dll_storage_attrs && self.tcx.is_dllimport_foreign_item(def_id) {
if self.use_dll_storage_attrs
&& let Some(library) = self.tcx.native_library(def_id)
&& library.kind.is_dllimport()
{
// For foreign (native) libs we know the exact storage type to use.
unsafe {
llvm::LLVMSetDLLStorageClass(g, llvm::DLLStorageClass::DllImport);