Skip to content

Commit 1bfe55a

Browse files
committed
[lld-link] Replace errorHandler() with ctx.e
errorHandler() uses the global state, which should be avoided in lld/COFF code.
1 parent dc6229b commit 1bfe55a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

lld/COFF/Driver.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
15821582
StringRef s = arg->getValue();
15831583
if (s.getAsInteger(10, n))
15841584
error(arg->getSpelling() + " number expected, but got " + s);
1585-
errorHandler().errorLimit = n;
1585+
ctx.e.errorLimit = n;
15861586
}
15871587

15881588
config->vfs = getVFS(args);
@@ -1696,7 +1696,7 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
16961696
// Handle /verbose
16971697
if (args.hasArg(OPT_verbose))
16981698
config->verbose = true;
1699-
errorHandler().verbose = config->verbose;
1699+
ctx.e.verbose = config->verbose;
17001700

17011701
// Handle /force or /force:unresolved
17021702
if (args.hasArg(OPT_force, OPT_force_unresolved))

lld/COFF/DriverUtils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ opt::InputArgList ArgParser::parse(ArrayRef<const char *> argv) {
934934
}
935935

936936
// Handle /WX early since it converts missing argument warnings to errors.
937-
errorHandler().fatalWarnings = args.hasFlag(OPT_WX, OPT_WX_no, false);
937+
ctx.e.fatalWarnings = args.hasFlag(OPT_WX, OPT_WX_no, false);
938938

939939
if (missingCount)
940940
fatal(Twine(args.getArgString(missingIndex)) + ": missing argument");

lld/COFF/Writer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ struct ChunkRange {
205205
class Writer {
206206
public:
207207
Writer(COFFLinkerContext &c)
208-
: buffer(errorHandler().outputBuffer), delayIdata(c), edata(c), ctx(c) {}
208+
: buffer(c.e.outputBuffer), delayIdata(c), edata(c), ctx(c) {}
209209
void run();
210210

211211
private:

0 commit comments

Comments
 (0)