Skip to content

Commit 908ca6c

Browse files
author
rnk
committed
[Support] Rename tool_output_file to ToolOutputFile, NFC
This class isn't similar to anything from the STL, so it shouldn't use the STL naming conventions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@314050 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 222a2f1 commit 908ca6c

File tree

28 files changed

+75
-77
lines changed

28 files changed

+75
-77
lines changed

‎include/llvm/LTO/LTO.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ std::string getThinLTOOutputFile(const std::string &Path,
7171
const std::string &NewPrefix);
7272

7373
/// Setup optimization remarks.
74-
Expected<std::unique_ptr<tool_output_file>>
74+
Expected<std::unique_ptr<ToolOutputFile>>
7575
setupOptimizationRemarks(LLVMContext &Context, StringRef LTORemarksFilename,
7676
bool LTOPassRemarksWithHotness, int Count = -1);
7777

‎include/llvm/LTO/legacy/LTOCodeGenerator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ struct LTOCodeGenerator {
237237
bool ShouldEmbedUselists = false;
238238
bool ShouldRestoreGlobalsLinkage = false;
239239
TargetMachine::CodeGenFileType FileType = TargetMachine::CGFT_ObjectFile;
240-
std::unique_ptr<tool_output_file> DiagnosticOutputFile;
240+
std::unique_ptr<ToolOutputFile> DiagnosticOutputFile;
241241
bool Freestanding = false;
242242
};
243243
}

‎include/llvm/Support/ToolOutputFile.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
//===----------------------------------------------------------------------===//
99
//
10-
// This file defines the tool_output_file class.
10+
// This file defines the ToolOutputFile class.
1111
//
1212
//===----------------------------------------------------------------------===//
1313

@@ -21,9 +21,9 @@ namespace llvm {
2121
/// This class contains a raw_fd_ostream and adds a few extra features commonly
2222
/// needed for compiler-like tool output files:
2323
/// - The file is automatically deleted if the process is killed.
24-
/// - The file is automatically deleted when the tool_output_file
24+
/// - The file is automatically deleted when the ToolOutputFile
2525
/// object is destroyed unless the client calls keep().
26-
class tool_output_file {
26+
class ToolOutputFile {
2727
/// This class is declared before the raw_fd_ostream so that it is constructed
2828
/// before the raw_fd_ostream is constructed and destructed after the
2929
/// raw_fd_ostream is destructed. It installs cleanups in its constructor and
@@ -45,10 +45,10 @@ class tool_output_file {
4545
public:
4646
/// This constructor's arguments are passed to to raw_fd_ostream's
4747
/// constructor.
48-
tool_output_file(StringRef Filename, std::error_code &EC,
49-
sys::fs::OpenFlags Flags);
48+
ToolOutputFile(StringRef Filename, std::error_code &EC,
49+
sys::fs::OpenFlags Flags);
5050

51-
tool_output_file(StringRef Filename, int FD);
51+
ToolOutputFile(StringRef Filename, int FD);
5252

5353
/// Return the contained raw_fd_ostream.
5454
raw_fd_ostream &os() { return OS; }

‎lib/LTO/LTO.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ Error LTO::runThinLTO(AddStreamFn AddStream, NativeObjectCache Cache,
11661166
return BackendProc->wait();
11671167
}
11681168

1169-
Expected<std::unique_ptr<tool_output_file>>
1169+
Expected<std::unique_ptr<ToolOutputFile>>
11701170
lto::setupOptimizationRemarks(LLVMContext &Context,
11711171
StringRef LTORemarksFilename,
11721172
bool LTOPassRemarksWithHotness, int Count) {
@@ -1179,7 +1179,7 @@ lto::setupOptimizationRemarks(LLVMContext &Context,
11791179

11801180
std::error_code EC;
11811181
auto DiagnosticFile =
1182-
llvm::make_unique<tool_output_file>(Filename, EC, sys::fs::F_None);
1182+
llvm::make_unique<ToolOutputFile>(Filename, EC, sys::fs::F_None);
11831183
if (EC)
11841184
return errorCodeToError(EC);
11851185
Context.setDiagnosticsOutputFile(

‎lib/LTO/LTOBackend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ Expected<const Target *> initAndLookupTarget(Config &C, Module &Mod) {
349349
}
350350

351351
static void
352-
finalizeOptimizationRemarks(std::unique_ptr<tool_output_file> DiagOutputFile) {
352+
finalizeOptimizationRemarks(std::unique_ptr<ToolOutputFile> DiagOutputFile) {
353353
// Make sure we flush the diagnostic remarks file in case the linker doesn't
354354
// call the global destructors before exiting.
355355
if (!DiagOutputFile)

‎lib/LTO/LTOCodeGenerator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ bool LTOCodeGenerator::writeMergedModules(StringRef Path) {
225225

226226
// create output file
227227
std::error_code EC;
228-
tool_output_file Out(Path, EC, sys::fs::F_None);
228+
ToolOutputFile Out(Path, EC, sys::fs::F_None);
229229
if (EC) {
230230
std::string ErrMsg = "could not open bitcode file for writing: ";
231231
ErrMsg += Path;
@@ -265,7 +265,7 @@ bool LTOCodeGenerator::compileOptimizedToFile(const char **Name) {
265265
}
266266

267267
// generate object file
268-
tool_output_file objFile(Filename, FD);
268+
ToolOutputFile objFile(Filename, FD);
269269

270270
bool genResult = compileOptimized(&objFile.os());
271271
objFile.os().close();

‎lib/Object/ArchiveWriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ Error llvm::writeArchive(StringRef ArcName,
394394
TmpArchiveFD, TmpArchive))
395395
return errorCodeToError(EC);
396396

397-
tool_output_file Output(TmpArchive, TmpArchiveFD);
397+
ToolOutputFile Output(TmpArchive, TmpArchiveFD);
398398
raw_fd_ostream &Out = Output.os();
399399
if (Thin)
400400
Out << "!<thin>\n";

‎lib/Support/ToolOutputFile.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//===--- ToolOutputFile.cpp - Implement the tool_output_file class --------===//
1+
//===--- ToolOutputFile.cpp - Implement the ToolOutputFile class --------===//
22
//
33
// The LLVM Compiler Infrastructure
44
//
@@ -7,7 +7,7 @@
77
//
88
//===----------------------------------------------------------------------===//
99
//
10-
// This implements the tool_output_file class.
10+
// This implements the ToolOutputFile class.
1111
//
1212
//===----------------------------------------------------------------------===//
1313

@@ -16,14 +16,14 @@
1616
#include "llvm/Support/Signals.h"
1717
using namespace llvm;
1818

19-
tool_output_file::CleanupInstaller::CleanupInstaller(StringRef Filename)
19+
ToolOutputFile::CleanupInstaller::CleanupInstaller(StringRef Filename)
2020
: Filename(Filename), Keep(false) {
2121
// Arrange for the file to be deleted if the process is killed.
2222
if (Filename != "-")
2323
sys::RemoveFileOnSignal(Filename);
2424
}
2525

26-
tool_output_file::CleanupInstaller::~CleanupInstaller() {
26+
ToolOutputFile::CleanupInstaller::~CleanupInstaller() {
2727
// Delete the file if the client hasn't told us not to.
2828
if (!Keep && Filename != "-")
2929
sys::fs::remove(Filename);
@@ -34,13 +34,13 @@ tool_output_file::CleanupInstaller::~CleanupInstaller() {
3434
sys::DontRemoveFileOnSignal(Filename);
3535
}
3636

37-
tool_output_file::tool_output_file(StringRef Filename, std::error_code &EC,
38-
sys::fs::OpenFlags Flags)
37+
ToolOutputFile::ToolOutputFile(StringRef Filename, std::error_code &EC,
38+
sys::fs::OpenFlags Flags)
3939
: Installer(Filename), OS(Filename, EC, Flags) {
4040
// If open fails, no cleanup is needed.
4141
if (EC)
4242
Installer.Keep = true;
4343
}
4444

45-
tool_output_file::tool_output_file(StringRef Filename, int FD)
45+
ToolOutputFile::ToolOutputFile(StringRef Filename, int FD)
4646
: Installer(Filename), OS(FD, true) {}

‎lib/TableGen/Main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static int createDependencyFile(const TGParser &Parser, const char *argv0) {
6161
return reportError(argv0, "the option -d must be used together with -o\n");
6262

6363
std::error_code EC;
64-
tool_output_file DepOut(DependFilename, EC, sys::fs::F_Text);
64+
ToolOutputFile DepOut(DependFilename, EC, sys::fs::F_Text);
6565
if (EC)
6666
return reportError(argv0, "error opening " + DependFilename + ":" +
6767
EC.message() + "\n");
@@ -97,7 +97,7 @@ int llvm::TableGenMain(char *argv0, TableGenMainFn *MainFn) {
9797
return 1;
9898

9999
std::error_code EC;
100-
tool_output_file Out(OutputFilename, EC, sys::fs::F_Text);
100+
ToolOutputFile Out(OutputFilename, EC, sys::fs::F_Text);
101101
if (EC)
102102
return reportError(argv0, "error opening " + OutputFilename + ":" +
103103
EC.message() + "\n");

‎tools/bugpoint/ExtractFunction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ BugDriver::extractMappedBlocksFromModule(const std::vector<BasicBlock *> &BBs,
385385
}
386386
sys::RemoveFileOnSignal(Filename);
387387

388-
tool_output_file BlocksToNotExtractFile(Filename.c_str(), FD);
388+
ToolOutputFile BlocksToNotExtractFile(Filename.c_str(), FD);
389389
for (std::vector<BasicBlock *>::const_iterator I = BBs.begin(), E = BBs.end();
390390
I != E; ++I) {
391391
BasicBlock *BB = *I;

‎tools/bugpoint/OptimizerDriver.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static cl::opt<std::string>
5858
/// writeProgramToFile - This writes the current "Program" to the named bitcode
5959
/// file. If an error occurs, true is returned.
6060
///
61-
static bool writeProgramToFileAux(tool_output_file &Out, const Module *M) {
61+
static bool writeProgramToFileAux(ToolOutputFile &Out, const Module *M) {
6262
WriteBitcodeToFile(M, Out.os(), PreserveBitcodeUseListOrder);
6363
Out.os().close();
6464
if (!Out.os().has_error()) {
@@ -70,14 +70,14 @@ static bool writeProgramToFileAux(tool_output_file &Out, const Module *M) {
7070

7171
bool BugDriver::writeProgramToFile(const std::string &Filename, int FD,
7272
const Module *M) const {
73-
tool_output_file Out(Filename, FD);
73+
ToolOutputFile Out(Filename, FD);
7474
return writeProgramToFileAux(Out, M);
7575
}
7676

7777
bool BugDriver::writeProgramToFile(const std::string &Filename,
7878
const Module *M) const {
7979
std::error_code EC;
80-
tool_output_file Out(Filename, EC, sys::fs::F_None);
80+
ToolOutputFile Out(Filename, EC, sys::fs::F_None);
8181
if (!EC)
8282
return writeProgramToFileAux(Out, M);
8383
return true;
@@ -154,7 +154,7 @@ bool BugDriver::runPasses(Module *Program,
154154
return 1;
155155
}
156156

157-
tool_output_file InFile(InputFilename, InputFD);
157+
ToolOutputFile InFile(InputFilename, InputFD);
158158

159159
WriteBitcodeToFile(Program, InFile.os(), PreserveBitcodeUseListOrder);
160160
InFile.os().close();

‎tools/llc/llc.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ static cl::opt<RunPassOption, true, cl::parser<std::string>> RunPass(
167167

168168
static int compileModule(char **, LLVMContext &);
169169

170-
static std::unique_ptr<tool_output_file>
171-
GetOutputStream(const char *TargetName, Triple::OSType OS,
172-
const char *ProgName) {
170+
static std::unique_ptr<ToolOutputFile> GetOutputStream(const char *TargetName,
171+
Triple::OSType OS,
172+
const char *ProgName) {
173173
// If we don't yet have an output filename, make one.
174174
if (OutputFilename.empty()) {
175175
if (InputFilename == "-")
@@ -225,8 +225,7 @@ GetOutputStream(const char *TargetName, Triple::OSType OS,
225225
sys::fs::OpenFlags OpenFlags = sys::fs::F_None;
226226
if (!Binary)
227227
OpenFlags |= sys::fs::F_Text;
228-
auto FDOut = llvm::make_unique<tool_output_file>(OutputFilename, EC,
229-
OpenFlags);
228+
auto FDOut = llvm::make_unique<ToolOutputFile>(OutputFilename, EC, OpenFlags);
230229
if (EC) {
231230
errs() << EC.message() << '\n';
232231
return nullptr;
@@ -322,11 +321,11 @@ int main(int argc, char **argv) {
322321
if (PassRemarksHotnessThreshold)
323322
Context.setDiagnosticsHotnessThreshold(PassRemarksHotnessThreshold);
324323

325-
std::unique_ptr<tool_output_file> YamlFile;
324+
std::unique_ptr<ToolOutputFile> YamlFile;
326325
if (RemarksFilename != "") {
327326
std::error_code EC;
328-
YamlFile = llvm::make_unique<tool_output_file>(RemarksFilename, EC,
329-
sys::fs::F_None);
327+
YamlFile =
328+
llvm::make_unique<ToolOutputFile>(RemarksFilename, EC, sys::fs::F_None);
330329
if (EC) {
331330
errs() << EC.message() << '\n';
332331
return 1;
@@ -470,7 +469,7 @@ static int compileModule(char **argv, LLVMContext &Context) {
470469
Options.FloatABIType = FloatABIForCalls;
471470

472471
// Figure out where we are going to send the output.
473-
std::unique_ptr<tool_output_file> Out =
472+
std::unique_ptr<ToolOutputFile> Out =
474473
GetOutputStream(TheTarget->getName(), TheTriple.getOS(), argv[0]);
475474
if (!Out) return 1;
476475

‎tools/llvm-as/llvm-as.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ static void WriteOutputFile(const Module *M) {
7272
}
7373

7474
std::error_code EC;
75-
std::unique_ptr<tool_output_file> Out(
76-
new tool_output_file(OutputFilename, EC, sys::fs::F_None));
75+
std::unique_ptr<ToolOutputFile> Out(
76+
new ToolOutputFile(OutputFilename, EC, sys::fs::F_None));
7777
if (EC) {
7878
errs() << EC.message() << '\n';
7979
exit(1);

‎tools/llvm-cov/CodeCoverage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ void CodeCoverageTool::demangleSymbols(const CoverageMapping &Coverage) {
446446
error(InputPath, EC.message());
447447
return;
448448
}
449-
tool_output_file InputTOF{InputPath, InputFD};
449+
ToolOutputFile InputTOF{InputPath, InputFD};
450450

451451
unsigned NumSymbols = 0;
452452
for (const auto &Function : Coverage.getCoveredFunctions()) {
@@ -464,7 +464,7 @@ void CodeCoverageTool::demangleSymbols(const CoverageMapping &Coverage) {
464464
error(OutputPath, EC.message());
465465
return;
466466
}
467-
tool_output_file OutputTOF{OutputPath, OutputFD};
467+
ToolOutputFile OutputTOF{OutputPath, OutputFD};
468468
OutputTOF.os().close();
469469

470470
// Invoke the demangler.

‎tools/llvm-dis/llvm-dis.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ int main(int argc, char **argv) {
191191
}
192192

193193
std::error_code EC;
194-
std::unique_ptr<tool_output_file> Out(
195-
new tool_output_file(OutputFilename, EC, sys::fs::F_None));
194+
std::unique_ptr<ToolOutputFile> Out(
195+
new ToolOutputFile(OutputFilename, EC, sys::fs::F_None));
196196
if (EC) {
197197
errs() << EC.message() << '\n';
198198
return 1;

‎tools/llvm-extract/llvm-extract.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ int main(int argc, char **argv) {
296296
Passes.add(createStripDeadPrototypesPass()); // Remove dead func decls
297297

298298
std::error_code EC;
299-
tool_output_file Out(OutputFilename, EC, sys::fs::F_None);
299+
ToolOutputFile Out(OutputFilename, EC, sys::fs::F_None);
300300
if (EC) {
301301
errs() << EC.message() << '\n';
302302
return 1;

‎tools/llvm-link/llvm-link.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ int main(int argc, char **argv) {
383383
if (DumpAsm) errs() << "Here's the assembly:\n" << *Composite;
384384

385385
std::error_code EC;
386-
tool_output_file Out(OutputFilename, EC, sys::fs::F_None);
386+
ToolOutputFile Out(OutputFilename, EC, sys::fs::F_None);
387387
if (EC) {
388388
errs() << EC.message() << '\n';
389389
return 1;

‎tools/llvm-lto/llvm-lto.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ int main(int argc, char **argv) {
936936
error("writing merged module failed.");
937937
}
938938

939-
std::list<tool_output_file> OSs;
939+
std::list<ToolOutputFile> OSs;
940940
std::vector<raw_pwrite_stream *> OSPtrs;
941941
for (unsigned I = 0; I != Parallelism; ++I) {
942942
std::string PartFilename = OutputFilename;
@@ -953,7 +953,7 @@ int main(int argc, char **argv) {
953953
// Diagnostic messages should have been printed by the handler.
954954
error("error compiling the code");
955955

956-
for (tool_output_file &OS : OSs)
956+
for (ToolOutputFile &OS : OSs)
957957
OS.keep();
958958
} else {
959959
if (Parallelism != 1)

‎tools/llvm-mc-assemble-fuzzer/llvm-mc-assemble-fuzzer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ int AssembleOneInput(const uint8_t *Data, size_t Size) {
209209

210210
std::error_code EC;
211211
const std::string OutputFilename = "-";
212-
auto Out = llvm::make_unique<tool_output_file>(OutputFilename, EC,
213-
sys::fs::F_None);
212+
auto Out =
213+
llvm::make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);
214214
if (EC) {
215215
errs() << EC.message() << '\n';
216216
abort();

‎tools/llvm-mc/llvm-mc.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,13 @@ static const Target *GetTarget(const char *ProgName) {
197197
return TheTarget;
198198
}
199199

200-
static std::unique_ptr<tool_output_file> GetOutputStream() {
200+
static std::unique_ptr<ToolOutputFile> GetOutputStream() {
201201
if (OutputFilename == "")
202202
OutputFilename = "-";
203203

204204
std::error_code EC;
205-
auto Out = llvm::make_unique<tool_output_file>(OutputFilename, EC,
206-
sys::fs::F_None);
205+
auto Out =
206+
llvm::make_unique<ToolOutputFile>(OutputFilename, EC, sys::fs::F_None);
207207
if (EC) {
208208
errs() << EC.message() << '\n';
209209
return nullptr;
@@ -534,7 +534,7 @@ int main(int argc, char **argv) {
534534
FeaturesStr = Features.getString();
535535
}
536536

537-
std::unique_ptr<tool_output_file> Out = GetOutputStream();
537+
std::unique_ptr<ToolOutputFile> Out = GetOutputStream();
538538
if (!Out)
539539
return 1;
540540

‎tools/llvm-modextract/llvm-modextract.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ int main(int argc, char **argv) {
5454
}
5555

5656
std::error_code EC;
57-
std::unique_ptr<tool_output_file> Out(
58-
new tool_output_file(OutputFilename, EC, sys::fs::F_None));
57+
std::unique_ptr<ToolOutputFile> Out(
58+
new ToolOutputFile(OutputFilename, EC, sys::fs::F_None));
5959
ExitOnErr(errorCodeToError(EC));
6060

6161
if (BinaryExtract) {

‎tools/llvm-objdump/MachODump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5950,7 +5950,7 @@ static void DumpBitcodeSection(MachOObjectFile *O, const char *sect,
59505950
errs() << XarEC.message() << "\n";
59515951
return;
59525952
}
5953-
tool_output_file XarFile(XarFilename, FD);
5953+
ToolOutputFile XarFile(XarFilename, FD);
59545954
raw_fd_ostream &XarOut = XarFile.os();
59555955
StringRef XarContents(sect, size);
59565956
XarOut << XarContents;

0 commit comments

Comments
 (0)