aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/Archive/ArchiveWriter.cpp1
-rw-r--r--lib/Bytecode/Archive/ArchiveWriter.cpp1
-rw-r--r--lib/Debugger/ProgramInfo.cpp1
-rw-r--r--lib/Debugger/SourceFile.cpp1
-rw-r--r--lib/Support/ToolRunner.cpp25
-rw-r--r--tools/bugpoint/ToolRunner.cpp25
6 files changed, 34 insertions, 20 deletions
diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp
index 64c2567..58e7853 100644
--- a/lib/Archive/ArchiveWriter.cpp
+++ b/lib/Archive/ArchiveWriter.cpp
@@ -13,7 +13,6 @@
#include "ArchiveInternals.h"
#include "llvm/Bytecode/Reader.h"
-#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/Compressor.h"
#include "llvm/System/Signals.h"
#include <fstream>
diff --git a/lib/Bytecode/Archive/ArchiveWriter.cpp b/lib/Bytecode/Archive/ArchiveWriter.cpp
index 64c2567..58e7853 100644
--- a/lib/Bytecode/Archive/ArchiveWriter.cpp
+++ b/lib/Bytecode/Archive/ArchiveWriter.cpp
@@ -13,7 +13,6 @@
#include "ArchiveInternals.h"
#include "llvm/Bytecode/Reader.h"
-#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/Compressor.h"
#include "llvm/System/Signals.h"
#include <fstream>
diff --git a/lib/Debugger/ProgramInfo.cpp b/lib/Debugger/ProgramInfo.cpp
index c0d85f9..17175c4 100644
--- a/lib/Debugger/ProgramInfo.cpp
+++ b/lib/Debugger/ProgramInfo.cpp
@@ -20,7 +20,6 @@
#include "llvm/Module.h"
#include "llvm/Debugger/SourceFile.h"
#include "llvm/Debugger/SourceLanguage.h"
-#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/SlowOperationInformer.h"
#include "llvm/ADT/STLExtras.h"
#include <iostream>
diff --git a/lib/Debugger/SourceFile.cpp b/lib/Debugger/SourceFile.cpp
index 9dc0a96..da2d347 100644
--- a/lib/Debugger/SourceFile.cpp
+++ b/lib/Debugger/SourceFile.cpp
@@ -13,7 +13,6 @@
#include "llvm/Debugger/SourceFile.h"
#include "llvm/Support/SlowOperationInformer.h"
-#include "llvm/Support/FileUtilities.h"
#include <iostream>
#include <cerrno>
#include <fcntl.h>
diff --git a/lib/Support/ToolRunner.cpp b/lib/Support/ToolRunner.cpp
index fcf6608..5f6336e 100644
--- a/lib/Support/ToolRunner.cpp
+++ b/lib/Support/ToolRunner.cpp
@@ -30,7 +30,8 @@ static void ProcessFailure(std::string ProgPath, const char** Args) {
OS << "\n";
// Rerun the compiler, capturing any error messages to print them.
- std::string ErrorFilename = getUniqueFilename("error_messages");
+ sys::Path ErrorFilename("error_messages");
+ ErrorFilename.makeUnique();
RunProgramWithTimeout(ProgPath, Args, "/dev/null", ErrorFilename.c_str(),
ErrorFilename.c_str());
@@ -43,7 +44,7 @@ static void ProcessFailure(std::string ProgPath, const char** Args) {
ErrorFile.close();
}
- removeFile(ErrorFilename);
+ removeFile(ErrorFilename.toString());
throw ToolExecutionError(OS.str());
}
@@ -123,7 +124,9 @@ AbstractInterpreter *AbstractInterpreter::createLLI(const std::string &ProgPath,
// LLC Implementation of AbstractIntepreter interface
//
void LLC::OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile) {
- OutputAsmFile = getUniqueFilename(Bytecode+".llc.s");
+ sys::Path uniqueFile(Bytecode+".llc.s");
+ uniqueFile.makeUnique();
+ OutputAsmFile = uniqueFile.toString();
std::vector<const char *> LLCArgs;
LLCArgs.push_back (LLCPath.c_str());
@@ -265,7 +268,9 @@ AbstractInterpreter *AbstractInterpreter::createJIT(const std::string &ProgPath,
void CBE::OutputC(const std::string &Bytecode,
std::string &OutputCFile) {
- OutputCFile = getUniqueFilename(Bytecode+".cbe.c");
+ sys::Path uniqueFile(Bytecode+".cbe.c");
+ uniqueFile.makeUnique();
+ OutputCFile = uniqueFile.toString();
std::vector<const char *> LLCArgs;
LLCArgs.push_back (LLCPath.c_str());
@@ -361,7 +366,8 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
}
GCCArgs.push_back(ProgramFile.c_str()); // Specify the input filename...
GCCArgs.push_back("-o");
- std::string OutputBinary = getUniqueFilename(ProgramFile+".gcc.exe");
+ sys::Path OutputBinary (ProgramFile+".gcc.exe");
+ OutputBinary.makeUnique();
GCCArgs.push_back(OutputBinary.c_str()); // Output to the right file...
GCCArgs.push_back("-lm"); // Hard-code the math library...
GCCArgs.push_back("-O2"); // Optimize the program a bit...
@@ -392,14 +398,17 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
std::cerr << "\n";
);
- FileRemover OutputBinaryRemover(OutputBinary);
- return RunProgramWithTimeout(OutputBinary, &ProgramArgs[0],
+ FileRemover OutputBinaryRemover(OutputBinary.toString());
+ return RunProgramWithTimeout(OutputBinary.toString(), &ProgramArgs[0],
InputFile, OutputFile, OutputFile, Timeout);
}
int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType,
std::string &OutputFile) {
- OutputFile = getUniqueFilename(InputFile+LTDL_SHLIB_EXT);
+ sys::Path uniqueFilename(InputFile+LTDL_SHLIB_EXT);
+ uniqueFilename.makeUnique();
+ OutputFile = uniqueFilename.toString();
+
// Compile the C/asm file into a shared object
const char* GCCArgs[] = {
GCCPath.c_str(),
diff --git a/tools/bugpoint/ToolRunner.cpp b/tools/bugpoint/ToolRunner.cpp
index fcf6608..5f6336e 100644
--- a/tools/bugpoint/ToolRunner.cpp
+++ b/tools/bugpoint/ToolRunner.cpp
@@ -30,7 +30,8 @@ static void ProcessFailure(std::string ProgPath, const char** Args) {
OS << "\n";
// Rerun the compiler, capturing any error messages to print them.
- std::string ErrorFilename = getUniqueFilename("error_messages");
+ sys::Path ErrorFilename("error_messages");
+ ErrorFilename.makeUnique();
RunProgramWithTimeout(ProgPath, Args, "/dev/null", ErrorFilename.c_str(),
ErrorFilename.c_str());
@@ -43,7 +44,7 @@ static void ProcessFailure(std::string ProgPath, const char** Args) {
ErrorFile.close();
}
- removeFile(ErrorFilename);
+ removeFile(ErrorFilename.toString());
throw ToolExecutionError(OS.str());
}
@@ -123,7 +124,9 @@ AbstractInterpreter *AbstractInterpreter::createLLI(const std::string &ProgPath,
// LLC Implementation of AbstractIntepreter interface
//
void LLC::OutputAsm(const std::string &Bytecode, std::string &OutputAsmFile) {
- OutputAsmFile = getUniqueFilename(Bytecode+".llc.s");
+ sys::Path uniqueFile(Bytecode+".llc.s");
+ uniqueFile.makeUnique();
+ OutputAsmFile = uniqueFile.toString();
std::vector<const char *> LLCArgs;
LLCArgs.push_back (LLCPath.c_str());
@@ -265,7 +268,9 @@ AbstractInterpreter *AbstractInterpreter::createJIT(const std::string &ProgPath,
void CBE::OutputC(const std::string &Bytecode,
std::string &OutputCFile) {
- OutputCFile = getUniqueFilename(Bytecode+".cbe.c");
+ sys::Path uniqueFile(Bytecode+".cbe.c");
+ uniqueFile.makeUnique();
+ OutputCFile = uniqueFile.toString();
std::vector<const char *> LLCArgs;
LLCArgs.push_back (LLCPath.c_str());
@@ -361,7 +366,8 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
}
GCCArgs.push_back(ProgramFile.c_str()); // Specify the input filename...
GCCArgs.push_back("-o");
- std::string OutputBinary = getUniqueFilename(ProgramFile+".gcc.exe");
+ sys::Path OutputBinary (ProgramFile+".gcc.exe");
+ OutputBinary.makeUnique();
GCCArgs.push_back(OutputBinary.c_str()); // Output to the right file...
GCCArgs.push_back("-lm"); // Hard-code the math library...
GCCArgs.push_back("-O2"); // Optimize the program a bit...
@@ -392,14 +398,17 @@ int GCC::ExecuteProgram(const std::string &ProgramFile,
std::cerr << "\n";
);
- FileRemover OutputBinaryRemover(OutputBinary);
- return RunProgramWithTimeout(OutputBinary, &ProgramArgs[0],
+ FileRemover OutputBinaryRemover(OutputBinary.toString());
+ return RunProgramWithTimeout(OutputBinary.toString(), &ProgramArgs[0],
InputFile, OutputFile, OutputFile, Timeout);
}
int GCC::MakeSharedObject(const std::string &InputFile, FileType fileType,
std::string &OutputFile) {
- OutputFile = getUniqueFilename(InputFile+LTDL_SHLIB_EXT);
+ sys::Path uniqueFilename(InputFile+LTDL_SHLIB_EXT);
+ uniqueFilename.makeUnique();
+ OutputFile = uniqueFilename.toString();
+
// Compile the C/asm file into a shared object
const char* GCCArgs[] = {
GCCPath.c_str(),
generated by cgit v1.1 at 2024-09-09 23:27:10 +0000