Skip to content

Commit 5c4ede8

Browse files
authored
Rollup merge of rust-lang#126938 - RalfJung:link_section, r=compiler-errors
miri: make sure we can find link_section statics even for the local crate Miri needs some way to iterate all the exported functions and "used" statics of all crates. For dependency crates, this already works fine since we can overwrite the query resonsible for computing `exported_symbols`, but it turns out for local binary crates this does not work: for binaries, `reachable_set` skips a lot of its logic and only checks `contains_extern_indicator()` and `RUSTC_STD_INTERNAL_SYMBOL`. Other flags like `CodegenFnAttrFlags::USED` are entirely ignored. This PR proposes to use the same check, `has_custom_linkage`, in binaries that we already use to drive the main workqueue of the reachability recursive traversal. I have no idea why binaries used a slightly different check that ignores `USED` -- was that deliberate or does it just not matter most of the time?
2 parents 95332b8 + d9a3423 commit 5c4ede8

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

compiler/rustc_passes/src/reachable.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use rustc_hir::def_id::{DefId, LocalDefId};
3030
use rustc_hir::intravisit::{self, Visitor};
3131
use rustc_hir::Node;
3232
use rustc_middle::bug;
33-
use rustc_middle::middle::codegen_fn_attrs::{CodegenFnAttrFlags, CodegenFnAttrs};
33+
use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
3434
use rustc_middle::middle::privacy::{self, Level};
3535
use rustc_middle::mir::interpret::{ConstAllocation, ErrorHandled, GlobalAlloc};
3636
use rustc_middle::query::Providers;
@@ -178,15 +178,7 @@ impl<'tcx> ReachableContext<'tcx> {
178178
if !self.any_library {
179179
// If we are building an executable, only explicitly extern
180180
// types need to be exported.
181-
let codegen_attrs = if self.tcx.def_kind(search_item).has_codegen_attrs() {
182-
self.tcx.codegen_fn_attrs(search_item)
183-
} else {
184-
CodegenFnAttrs::EMPTY
185-
};
186-
let is_extern = codegen_attrs.contains_extern_indicator();
187-
let std_internal =
188-
codegen_attrs.flags.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL);
189-
if is_extern || std_internal {
181+
if has_custom_linkage(self.tcx, search_item) {
190182
self.reachable_symbols.insert(search_item);
191183
}
192184
} else {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//! Ensure that we call Windows TLS callbacks in the local crate.
2+
//@only-target-windows
3+
// Calling eprintln in the callback seems to (re-)initialize some thread-local storage
4+
// and then leak the memory allocated for that. Let's just ignore these leaks,
5+
// that's not what this test is about.
6+
//@compile-flags: -Zmiri-ignore-leaks
7+
8+
#[link_section = ".CRT$XLB"]
9+
#[used] // Miri only considers explicitly `#[used]` statics for `lookup_link_section`
10+
pub static CALLBACK: unsafe extern "system" fn(*const (), u32, *const ()) = tls_callback;
11+
12+
unsafe extern "system" fn tls_callback(_h: *const (), _dw_reason: u32, _pv: *const ()) {
13+
eprintln!("in tls_callback");
14+
}
15+
16+
fn main() {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
in tls_callback

0 commit comments

Comments
 (0)