Skip to content

Commit 18b89ee

Browse files
committed
Fixup conflict resolution
1 parent ae6c7b2 commit 18b89ee

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

lld/COFF/Writer.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2608,10 +2608,11 @@ void Writer::prepareLoadConfig() {
26082608
auto *b = cast_if_present<DefinedRegular>(sym);
26092609
if (!b) {
26102610
if (ctx.config.guardCF != GuardCFLevel::Off)
2611-
Warn("Control Flow Guard is enabled but '_load_config_used' is missing");
2611+
Warn(ctx)
2612+
<< "Control Flow Guard is enabled but '_load_config_used' is missing";
26122613
if (ctx.config.dependentLoadFlags)
2613-
Warn("_load_config_used not found, /dependentloadflag will have no "
2614-
"effect");
2614+
Warn(ctx) << "_load_config_used not found, /dependentloadflag will have "
2615+
"no effect";
26152616
return;
26162617
}
26172618

0 commit comments

Comments
 (0)