Skip to content

Commit ddc0eb7

Browse files
committed
[lld,MinGW] Use context-aware outs() and errs()
lld::outs() and lld::errs() use the global errorHandler() and should be avoided.
1 parent 834457a commit ddc0eb7

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

lld/MinGW/Driver.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,12 @@ class MinGWOptTable : public opt::GenericOptTable {
9797
};
9898
} // namespace
9999

100-
static void printHelp(const char *argv0) {
100+
static void printHelp(CommonLinkerContext &ctx, const char *argv0) {
101+
auto &outs = ctx.e.outs();
101102
MinGWOptTable().printHelp(
102-
lld::outs(), (std::string(argv0) + " [options] file...").c_str(), "lld",
103-
false /*ShowHidden*/, true /*ShowAllAliases*/);
104-
lld::outs() << "\n";
103+
outs, (std::string(argv0) + " [options] file...").c_str(), "lld",
104+
/*ShowHidden=*/false, /*ShowAllAliases=*/true);
105+
outs << '\n';
105106
}
106107

107108
static cl::TokenizerCallback getQuotingStyle() {
@@ -189,7 +190,7 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
189190
return false;
190191

191192
if (args.hasArg(OPT_help)) {
192-
printHelp(argsArr[0]);
193+
printHelp(*ctx, argsArr[0]);
193194
return true;
194195
}
195196

@@ -563,7 +564,7 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
563564
return false;
564565

565566
if (args.hasArg(OPT_verbose) || args.hasArg(OPT__HASH_HASH_HASH))
566-
lld::errs() << llvm::join(linkArgs, " ") << "\n";
567+
ctx->e.errs() << llvm::join(linkArgs, " ") << "\n";
567568

568569
if (args.hasArg(OPT__HASH_HASH_HASH))
569570
return true;

0 commit comments

Comments
 (0)