[LLD][ELF] Assert TargetInfo correctness for when ctx becomes a local #111139
Conversation
… a local variable TargetInfos are currently function-statics. Add an assert to Guard against that causing problems if ctx is changed from a global variable to a local variable.
|
@llvm/pr-subscribers-lld Author: bd1976bris (bd1976bris) ChangesTargetInfos are currently function-statics, e.g: llvm-project/lld/ELF/Arch/X86_64.cpp Line 1257 in 6294679 Add an assert to Guard against that causing problems if ctx is changed from a global variable to a local variable. Full diff: https://github.com/llvm/llvm-project/pull/111139.diff 1 Files Affected:
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 373505a9e965b7..5042c23fd7b07e 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -3123,6 +3123,10 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
// relocations or writing a PLT section. It also contains target-dependent
// values such as a default image base address.
ctx.target = getTarget(ctx);
+ // Currently, the TargetInfo structures in are function-statics. Guard against
+ // that causing problems if ctx is changed from a global variable to a local
+ // variable.
+ assert(&ctx.target->ctx == &ctx);
ctx.arg.eflags = ctx.target->calcEFlags();
// maxPageSize (sometimes called abi page size) is the maximum page size that
|
|
@llvm/pr-subscribers-lld-elf Author: bd1976bris (bd1976bris) ChangesTargetInfos are currently function-statics, e.g: llvm-project/lld/ELF/Arch/X86_64.cpp Line 1257 in 6294679 Add an assert to Guard against that causing problems if ctx is changed from a global variable to a local variable. Full diff: https://github.com/llvm/llvm-project/pull/111139.diff 1 Files Affected:
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 373505a9e965b7..5042c23fd7b07e 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -3123,6 +3123,10 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
// relocations or writing a PLT section. It also contains target-dependent
// values such as a default image base address.
ctx.target = getTarget(ctx);
+ // Currently, the TargetInfo structures in are function-statics. Guard against
+ // that causing problems if ctx is changed from a global variable to a local
+ // variable.
+ assert(&ctx.target->ctx == &ctx);
ctx.arg.eflags = ctx.target->calcEFlags();
// maxPageSize (sometimes called abi page size) is the maximum page size that
|
|
With #111206 this should be unnecessary |
TargetInfos are currently function-statics, e.g:
llvm-project/lld/ELF/Arch/X86_64.cpp
Line 1257 in 6294679
Add an assert to Guard against that causing problems if ctx is changed from a global variable to a local variable.