Skip to content

Commit 884e21f

Browse files
committed
lint
1 parent 1082e93 commit 884e21f

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

lld/COFF/Driver.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2145,13 +2145,14 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
21452145
config->integrityCheck =
21462146
args.hasFlag(OPT_integritycheck, OPT_integritycheck_no, false);
21472147
config->cetCompat = args.hasFlag(OPT_cetcompat, OPT_cetcompat_no, false);
2148-
config->cetCompatStrict = args.hasFlag(OPT_cetcompatstrict, OPT_cetcompatstrict_no, false);
2149-
config->cetCompatIpValidationRelaxed =
2150-
args.hasFlag(OPT_cetipvalidationrelaxed, OPT_cetipvalidationrelaxed_no, false);
2151-
config->cetCompatDynamicApisInProcOnly =
2152-
args.hasFlag(OPT_cetdynamicapisinproc, OPT_cetdynamicapisinproc_no, false);
2148+
config->cetCompatStrict =
2149+
args.hasFlag(OPT_cetcompatstrict, OPT_cetcompatstrict_no, false);
2150+
config->cetCompatIpValidationRelaxed = args.hasFlag(
2151+
OPT_cetipvalidationrelaxed, OPT_cetipvalidationrelaxed_no, false);
2152+
config->cetCompatDynamicApisInProcOnly = args.hasFlag(
2153+
OPT_cetdynamicapisinproc, OPT_cetdynamicapisinproc_no, false);
21532154
config->hotpatchCompat =
2154-
args.hasFlag(OPT_hotpatchcompatible, OPT_hotpatchcompatible_no, false);
2155+
args.hasFlag(OPT_hotpatchcompatible, OPT_hotpatchcompatible_no, false);
21552156
config->nxCompat = args.hasFlag(OPT_nxcompat, OPT_nxcompat_no, true);
21562157
for (auto *arg : args.filtered(OPT_swaprun))
21572158
parseSwaprun(arg->getValue());

lld/COFF/Writer.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,21 +1248,22 @@ void Writer::createMiscChunks() {
12481248
IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT_STRICT_MODE;
12491249
}
12501250
if (config->cetCompatIpValidationRelaxed) {
1251-
ex_characteristics_flags |=
1251+
ex_characteristics_flags |=
12521252
IMAGE_DLL_CHARACTERISTICS_EX_CET_SET_CONTEXT_IP_VALIDATION_RELAXED_MODE;
12531253
}
12541254
if (config->cetCompatDynamicApisInProcOnly) {
1255-
ex_characteristics_flags |=
1255+
ex_characteristics_flags |=
12561256
IMAGE_DLL_CHARACTERISTICS_EX_CET_DYNAMIC_APIS_ALLOW_IN_PROC_ONLY;
12571257
}
12581258
if (config->hotpatchCompat) {
1259-
ex_characteristics_flags |= IMAGE_DLL_CHARACTERISTICS_EX_HOTPATCH_COMPATIBLE;
1259+
ex_characteristics_flags |=
1260+
IMAGE_DLL_CHARACTERISTICS_EX_HOTPATCH_COMPATIBLE;
12601261
}
12611262

12621263
if (ex_characteristics_flags) {
1263-
debugRecords.emplace_back(COFF::IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS,
1264-
make<ExtendedDllCharacteristicsChunk>(
1265-
ex_characteristics_flags));
1264+
debugRecords.emplace_back(
1265+
COFF::IMAGE_DEBUG_TYPE_EX_DLLCHARACTERISTICS,
1266+
make<ExtendedDllCharacteristicsChunk>(ex_characteristics_flags));
12661267
}
12671268

12681269
// Align and add each chunk referenced by the debug data directory.

llvm/include/llvm/BinaryFormat/COFF.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,10 @@ enum ExtendedDLLCharacteristics : unsigned {
697697
IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT = 0x0001,
698698
/// Image is CET compatible in strict mode
699699
IMAGE_DLL_CHARACTERISTICS_EX_CET_COMPAT_STRICT_MODE = 0x0002,
700-
/// Image is CET compatible in such a way that context IP validation is relaxed
701-
IMAGE_DLL_CHARACTERISTICS_EX_CET_SET_CONTEXT_IP_VALIDATION_RELAXED_MODE = 0x0004,
700+
/// Image is CET compatible in such a way that context IP validation is
701+
/// relaxed
702+
IMAGE_DLL_CHARACTERISTICS_EX_CET_SET_CONTEXT_IP_VALIDATION_RELAXED_MODE =
703+
0x0004,
702704
/// Image is CET compatible in such a way that the use of
703705
/// dynamic APIs is restricted to processes only
704706
IMAGE_DLL_CHARACTERISTICS_EX_CET_DYNAMIC_APIS_ALLOW_IN_PROC_ONLY = 0x0008,

0 commit comments

Comments
 (0)