diff options
| author | bors <bors@rust-lang.org> | 2025-05-25 17:56:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-25 17:56:48 +0000 |
| commit | 95597e848d27a82b8864c677ab807e9f0be1f68c (patch) | |
| tree | f26c89fd352b0857450dbabb562c3545a9504e1e /compiler/rustc_codegen_llvm/src | |
| parent | 5dadfd5c417f0b66816cb7ca662859e2c8751fb3 (diff) | |
| parent | 5257f89f89b6c7dd93074e5ea43bb7ae61ccc7a2 (diff) | |
| download | rust-95597e848d27a82b8864c677ab807e9f0be1f68c.tar.gz rust-95597e848d27a82b8864c677ab807e9f0be1f68c.zip | |
Auto merge of #141412 - cuviper:beta-next, r=Mark-Simulacrum
[beta] backports and stage0 bump - bump stage0 to 1.87.0 - Update the edition guide for let chains rust-lang/rust#140852 - Fix download of GCC from CI on non-nightly channels rust-lang/rust#140901 - Revert "Fix linking statics on Arm64EC rust-lang/rust#140176" rust-lang/rust#141024 - [win][arm64] Remove 'Arm64 Hazard' undocumented MSVC option and instead disable problematic test rust-lang/rust#141045 - Do not call name() on rpitit assoc_item rust-lang/rust#141308 - Temporarily use Windows Server 2022 instead of Windows Server 2025 images rust-lang/rust#141023 - Use Docker cache from the current repository rust-lang/rust#141280 - Move dist-x86_64-linux CI job to GitHub temporarily rust-lang/rust#141388 - ci: prepare aws access keys for migration rust-lang/rust#141389 - Add bors environment to CI rust-lang/rust#141323 - ci: split dist-arm-linux job rust-lang/rust#141078 r? cuviper
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/consts.rs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/compiler/rustc_codegen_llvm/src/consts.rs b/compiler/rustc_codegen_llvm/src/consts.rs index cbac55c7153..bf81eb648f8 100644 --- a/compiler/rustc_codegen_llvm/src/consts.rs +++ b/compiler/rustc_codegen_llvm/src/consts.rs @@ -364,12 +364,7 @@ impl<'ll> CodegenCx<'ll, '_> { if !def_id.is_local() { let needs_dll_storage_attr = self.use_dll_storage_attrs - // If the symbol is a foreign item, then don't automatically apply DLLImport, as - // we'll rely on the #[link] attribute instead. BUT, if this is an internal symbol - // then it may be generated by the compiler in some crate, so we do need to apply - // DLLImport when linking with the MSVC linker. - && (!self.tcx.is_foreign_item(def_id) - || (self.sess().target.is_like_msvc && fn_attrs.flags.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL))) + && !self.tcx.is_foreign_item(def_id) // Local definitions can never be imported, so we must not apply // the DLLImport annotation. && !dso_local |