[lld] 303370e - [LLD] [COFF] Mark the symbol _tls_used as a GC root (#71336)

via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 7 01:49:09 PST 2023


Author: Martin Storsjö
Date: 2023-11-07T11:49:05+02:00
New Revision: 303370e87166305248122a03c9913fde02156f99

URL: https://github.com/llvm/llvm-project/commit/303370e87166305248122a03c9913fde02156f99
DIFF: https://github.com/llvm/llvm-project/commit/303370e87166305248122a03c9913fde02156f99.diff

LOG: [LLD] [COFF] Mark the symbol _tls_used as a GC root (#71336)

This is necessary if the object file containing _tls_used is built with
-fdata-sections; if this symbol is present, lld is going to include
references to it in the PE header, in the TLS_TABLE data directory.

Therefore, treat the symbol as a GC root, i.e. retain it (and whatever
other symbols the section chunk references) when doing doing GC
(/opt:ref), if the symbol is present.

Added: 
    lld/test/COFF/tls-used-gc.s

Modified: 
    lld/COFF/Driver.cpp

Removed: 
    


################################################################################
diff  --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp
index 5613c2e6993a5af..b2d0edd8cb2600e 100644
--- a/lld/COFF/Driver.cpp
+++ b/lld/COFF/Driver.cpp
@@ -2472,6 +2472,10 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
   // resolve symbols and write indices, but don't generate native code or link).
   ctx.symtab.compileBitcodeFiles();
 
+  if (Defined *d =
+          dyn_cast_or_null<Defined>(ctx.symtab.findUnderscore("_tls_used")))
+    config->gcroot.push_back(d);
+
   // If -thinlto-index-only is given, we should create only "index
   // files" and not object files. Index file creation is already done
   // in addCombinedLTOObject, so we are done if that's the case.

diff  --git a/lld/test/COFF/tls-used-gc.s b/lld/test/COFF/tls-used-gc.s
new file mode 100644
index 000000000000000..4736be67494985f
--- /dev/null
+++ b/lld/test/COFF/tls-used-gc.s
@@ -0,0 +1,21 @@
+# REQUIRES: x86
+# RUN: llvm-mc -triple=x86_64-windows-gnu -filetype=obj -o %t.obj %s
+# RUN: lld-link %t.obj /out:%t.exe /entry:main /subsystem:console /opt:ref
+# RUN: llvm-readobj --file-headers %t.exe | FileCheck %s
+
+# CHECK: TLSTableRVA: 0x1000
+# CHECK: TLSTableSize: 0x28
+
+  .section .text at main,"xr",one_only,main
+  .globl main
+main:
+  ret
+
+  .section .tls$aaa
+tlsvar:
+  .long 1
+
+  .section .rdata$_tls_used,"dr",one_only,_tls_used
+  .globl _tls_used
+_tls_used:
+  .zero 40


        


More information about the llvm-commits mailing list