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

Auto merge of #139385 - joboet:threadlocal_address, r=nikic

Browse Source 
rustc_codegen_llvm: use `threadlocal.address` intrinsic to access TLS

Fixes #136044
r? `@nikic`
This commit is contained in:
bors
2025-05-30 15:39:56 +00:00
parent aa5832b142 e4d9b06cc8
commit 15825b7161
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_codegen_llvm/src/builder.rs
View File

@@ -1452,9 +1452,15 @@ impl<'a, 'll, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'll, 'tcx> {
impl<'ll> StaticBuilderMethods for Builder<'_, 'll, '_> {
fn get_static(&mut self, def_id: DefId) -> &'ll Value {
// Forward to the `get_static` method of `CodegenCx`
let s = self.cx().get_static(def_id);
// Cast to default address space if globals are in a different addrspace
self.cx().const_pointercast(s, self.type_ptr())
let global = self.cx().get_static(def_id);
if self.cx().tcx.is_thread_local_static(def_id) {
let pointer = self.call_intrinsic("llvm.threadlocal.address", &[global]);
// Cast to default address space if globals are in a different addrspace
self.pointercast(pointer, self.type_ptr())
} else {
// Cast to default address space if globals are in a different addrspace
self.cx().const_pointercast(global, self.type_ptr())
}
}
}