1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00

Don't use PathV1.h in LTOCodeGenerator.cpp

This patch also adds a simpler version of sys::fs::remove and a tool_output_file
constructor for when we already have an open file.

llvm-svn: 184095
This commit is contained in:
Rafael Espindola 2013-06-17 18:05:35 +00:00
parent ab943cbd48
commit 2b411d1243
4 changed files with 27 additions and 17 deletions

View File

@ -292,6 +292,13 @@ error_code current_path(SmallVectorImpl<char> &result);
/// successfully set, otherwise a platform specific error_code.
error_code remove(const Twine &path, bool &existed);
/// @brief Convenience function for clients that don't need to know if the file
/// existed or not.
inline error_code remove(const Twine &Path) {
bool Existed;
return remove(Path, Existed);
}
/// @brief Recursively remove all files below \a path, then \a path. Files are
/// removed as if by POSIX remove().
///

View File

@ -49,6 +49,8 @@ public:
tool_output_file(const char *filename, std::string &ErrorInfo,
unsigned Flags = 0);
tool_output_file(const char *Filename, int FD);
/// os - Return the contained raw_fd_ostream.
raw_fd_ostream &os() { return OS; }

View File

@ -44,3 +44,7 @@ tool_output_file::tool_output_file(const char *filename, std::string &ErrorInfo,
if (!ErrorInfo.empty())
Installer.Keep = true;
}
tool_output_file::tool_output_file(const char *Filename, int FD)
: Installer(Filename), OS(FD, true) {
}

View File

@ -30,10 +30,10 @@
#include "llvm/MC/SubtargetFeature.h"
#include "llvm/PassManager.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/FormattedStream.h"
#include "llvm/Support/Host.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/PathV1.h"
#include "llvm/Support/Signals.h"
#include "llvm/Support/TargetRegistry.h"
#include "llvm/Support/TargetSelect.h"
@ -160,36 +160,33 @@ bool LTOCodeGenerator::writeMergedModules(const char *path,
bool LTOCodeGenerator::compile_to_file(const char** name, std::string& errMsg) {
// make unique temp .o file to put generated object file
sys::PathWithStatus uniqueObjPath("lto-llvm.o");
if (uniqueObjPath.createTemporaryFileOnDisk(false, &errMsg)) {
uniqueObjPath.eraseFromDisk();
SmallString<128> Filename;
int FD;
error_code EC = sys::fs::unique_file("lto-llvm-%%%%%%%.o",
FD, Filename);
if (EC) {
errMsg = EC.message();
return true;
}
sys::RemoveFileOnSignal(uniqueObjPath.str());
// generate object file
bool genResult = false;
tool_output_file objFile(uniqueObjPath.c_str(), errMsg);
if (!errMsg.empty()) {
uniqueObjPath.eraseFromDisk();
return true;
}
tool_output_file objFile(Filename.c_str(), FD);
genResult = this->generateObjectFile(objFile.os(), errMsg);
bool genResult = generateObjectFile(objFile.os(), errMsg);
objFile.os().close();
if (objFile.os().has_error()) {
objFile.os().clear_error();
uniqueObjPath.eraseFromDisk();
sys::fs::remove(Twine(Filename));
return true;
}
objFile.keep();
if (genResult) {
uniqueObjPath.eraseFromDisk();
sys::fs::remove(Twine(Filename));
return true;
}
_nativeObjectPath = uniqueObjPath.str();
_nativeObjectPath = Filename.c_str();
*name = _nativeObjectPath.c_str();
return false;
}
@ -206,13 +203,13 @@ const void* LTOCodeGenerator::compile(size_t* length, std::string& errMsg) {
OwningPtr<MemoryBuffer> BuffPtr;
if (error_code ec = MemoryBuffer::getFile(name, BuffPtr, -1, false)) {
errMsg = ec.message();
sys::Path(_nativeObjectPath).eraseFromDisk();
sys::fs::remove(_nativeObjectPath);
return NULL;
}
_nativeObjectFile = BuffPtr.take();
// remove temp files
sys::Path(_nativeObjectPath).eraseFromDisk();
sys::fs::remove(_nativeObjectPath);
// return buffer, unless error
if (_nativeObjectFile == NULL)