Skip to content

Commit 76947e0

Browse files
nurmukhametovnurmukhametov
authored
[LLD][COFF] Support /DEPENDENTLOADFLAG[:flags] (#71537)
This should fix #43935
1 parent fd389f4 commit 76947e0

File tree

8 files changed

+98
-7
lines changed

8 files changed

+98
-7
lines changed

‎lld/COFF/Config.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ struct Configuration {
287287
uint32_t timestamp = 0;
288288
uint32_t functionPadMin = 0;
289289
uint32_t timeTraceGranularity = 0;
290+
uint16_t dependentLoadFlags = 0;
290291
bool dynamicBase = true;
291292
bool allowBind = true;
292293
bool cetCompat = false;

‎lld/COFF/Driver.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,6 +2179,11 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
21792179
for (auto *arg : args.filtered(OPT_functionpadmin, OPT_functionpadmin_opt))
21802180
parseFunctionPadMin(arg);
21812181

2182+
// Handle /dependentloadflag
2183+
for (auto *arg :
2184+
args.filtered(OPT_dependentloadflag, OPT_dependentloadflag_opt))
2185+
parseDependentLoadFlags(arg);
2186+
21822187
if (tar) {
21832188
llvm::TimeTraceScope timeScope("Reproducer: response file");
21842189
tar->append("response.txt",

‎lld/COFF/Driver.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ class LinkerDriver {
233233
// Parses a string in the form of "[:<integer>]"
234234
void parseFunctionPadMin(llvm::opt::Arg *a);
235235

236+
// Parses a string in the form of "[:<integer>]"
237+
void parseDependentLoadFlags(llvm::opt::Arg *a);
238+
236239
// Parses a string in the form of "EMBED[,=<integer>]|NO".
237240
void parseManifest(StringRef arg);
238241

‎lld/COFF/DriverUtils.cpp

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,19 @@ void LinkerDriver::parseFunctionPadMin(llvm::opt::Arg *a) {
265265
}
266266
}
267267

268+
// Parses /dependentloadflag option argument.
269+
void LinkerDriver::parseDependentLoadFlags(llvm::opt::Arg *a) {
270+
StringRef arg = a->getNumValues() ? a->getValue() : "";
271+
if (!arg.empty()) {
272+
if (arg.getAsInteger(0, ctx.config.dependentLoadFlags))
273+
error("/dependentloadflag: invalid argument: " + arg);
274+
return;
275+
}
276+
// MSVC linker reports error "no argument specified", although MSDN describes
277+
// argument as optional.
278+
error("/dependentloadflag: no argument specified");
279+
}
280+
268281
// Parses a string in the form of "EMBED[,=<integer>]|NO".
269282
// Results are directly written to
270283
// Config.

‎lld/COFF/Options.td

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ def filealign : P<"filealign", "Section alignment in the output file">;
5656
def functionpadmin : F<"functionpadmin">;
5757
def functionpadmin_opt : P<"functionpadmin",
5858
"Prepares an image for hotpatching">;
59+
def dependentloadflag : F<"dependentloadflag">;
60+
def dependentloadflag_opt : P<"dependentloadflag",
61+
"Sets the default load flags used to resolve the statically linked imports of a module">;
5962
def guard : P<"guard", "Control flow guard">;
6063
def heap : P<"heap", "Size of the heap">;
6164
def ignore : P<"ignore", "Specify warning codes to ignore">;

‎lld/COFF/Writer.cpp

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,8 @@ class Writer {
264264

265265
uint32_t getSizeOfInitializedData();
266266

267-
void checkLoadConfig();
267+
void prepareLoadConfig();
268+
template <typename T> void prepareLoadConfig(T *loadConfig);
268269
template <typename T> void checkLoadConfigGuardData(const T *loadConfig);
269270

270271
std::unique_ptr<FileOutputBuffer> &buffer;
@@ -696,7 +697,7 @@ void Writer::run() {
696697
writeHeader<pe32_header>();
697698
}
698699
writeSections();
699-
checkLoadConfig();
700+
prepareLoadConfig();
700701
sortExceptionTable();
701702

702703
// Fix up the alignment in the TLS Directory's characteristic field,
@@ -2256,7 +2257,7 @@ void Writer::fixTlsAlignment() {
22562257
}
22572258
}
22582259

2259-
void Writer::checkLoadConfig() {
2260+
void Writer::prepareLoadConfig() {
22602261
Symbol *sym = ctx.symtab.findUnderscore("_load_config_used");
22612262
auto *b = cast_if_present<DefinedRegular>(sym);
22622263
if (!b) {
@@ -2280,11 +2281,16 @@ void Writer::checkLoadConfig() {
22802281
Twine(expectedAlign) + " bytes)");
22812282

22822283
if (ctx.config.is64())
2283-
checkLoadConfigGuardData(
2284-
reinterpret_cast<const coff_load_configuration64 *>(symBuf));
2284+
prepareLoadConfig(reinterpret_cast<coff_load_configuration64 *>(symBuf));
22852285
else
2286-
checkLoadConfigGuardData(
2287-
reinterpret_cast<const coff_load_configuration32 *>(symBuf));
2286+
prepareLoadConfig(reinterpret_cast<coff_load_configuration32 *>(symBuf));
2287+
}
2288+
2289+
template <typename T> void Writer::prepareLoadConfig(T *loadConfig) {
2290+
if (ctx.config.dependentLoadFlags)
2291+
loadConfig->DependentLoadFlags = ctx.config.dependentLoadFlags;
2292+
2293+
checkLoadConfigGuardData(loadConfig);
22882294
}
22892295

22902296
template <typename T>

‎lld/test/COFF/dependentflags.test

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
// ---- precomp-a.obj - x86_64, hotpatch
2+
RUN: llvm-mc -triple x86_64-windows-msvc -filetype=obj %S/Inputs/loadconfig-cfg-x64.s -o %t.ldcfg.obj
3+
4+
RUN: lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force
5+
RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix BASE
6+
7+
RUN: lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag:0x800
8+
RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix FLAGS-800
9+
10+
// ---- Many arguments
11+
RUN: lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag:0x400 /dependentloadflag:0x800
12+
RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix FLAGS-800
13+
14+
RUN: lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag:0x800 /dependentloadflag:0x400
15+
RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix FLAGS-400
16+
17+
RUN: not lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag 2>&1 | FileCheck %s --check-prefix FAIL-NOARG
18+
RUN: not lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag:zz 2>&1 | FileCheck %s --check-prefix FAIL
19+
RUN: not lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag:0xf0000 2>&1 | FileCheck %s --check-prefix FAIL-RANGE
20+
21+
22+
BASE: DependentLoadFlags: 0x0
23+
FLAGS-800: DependentLoadFlags: 0x800
24+
FLAGS-400: DependentLoadFlags: 0x400
25+
26+
FAIL: lld-link: error: /dependentloadflag: invalid argument: zz
27+
FAIL-RANGE: lld-link: error: /dependentloadflag: invalid argument: 0xf0000
28+
FAIL-NOARG: lld-link: error: /dependentloadflag: no argument specified
29+

‎lld/test/COFF/deploadflag-cfg-x64.s

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# RUN: llvm-mc -triple x86_64-windows-msvc -filetype=obj %s -o %t.ldcfg.obj
2+
3+
# RUN: lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force
4+
# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix FLAGS-400
5+
6+
# RUN: lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag:0x800
7+
# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix FLAGS-800
8+
9+
# MSVC linker does not rewrite non-zero value of dependentloadflag in _load_config_used with zero
10+
# RUN: lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag:0x0
11+
# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix FLAGS-400
12+
13+
# RUN: lld-link %S/Inputs/precomp-a.obj %t.ldcfg.obj /out:%t.exe /nodefaultlib /force /dependentloadflag:0x800 /dependentloadflag:0x0
14+
# RUN: llvm-readobj --coff-load-config %t.exe | FileCheck %s --check-prefix FLAGS-400
15+
16+
# FLAGS-800: DependentLoadFlags: 0x800
17+
# FLAGS-400: DependentLoadFlags: 0x400
18+
19+
.section .rdata,"dr"
20+
.globl _load_config_used
21+
_load_config_used:
22+
.long 256
23+
.fill 74, 1, 0
24+
.byte 0x00
25+
.byte 0x40
26+
.fill 48, 1, 0
27+
.quad __guard_fids_table
28+
.quad __guard_fids_count
29+
.long __guard_flags
30+
.fill 128, 1, 0
31+

0 commit comments

Comments
 (0)