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:
parent
d55eadf0be
commit
40c908bfad
|
@ -292,6 +292,13 @@ error_code current_path(SmallVectorImpl<char> &result);
|
||||||
/// successfully set, otherwise a platform specific error_code.
|
/// successfully set, otherwise a platform specific error_code.
|
||||||
error_code remove(const Twine &path, bool &existed);
|
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
|
/// @brief Recursively remove all files below \a path, then \a path. Files are
|
||||||
/// removed as if by POSIX remove().
|
/// removed as if by POSIX remove().
|
||||||
///
|
///
|
||||||
|
|
|
@ -49,6 +49,8 @@ public:
|
||||||
tool_output_file(const char *filename, std::string &ErrorInfo,
|
tool_output_file(const char *filename, std::string &ErrorInfo,
|
||||||
unsigned Flags = 0);
|
unsigned Flags = 0);
|
||||||
|
|
||||||
|
tool_output_file(const char *Filename, int FD);
|
||||||
|
|
||||||
/// os - Return the contained raw_fd_ostream.
|
/// os - Return the contained raw_fd_ostream.
|
||||||
raw_fd_ostream &os() { return OS; }
|
raw_fd_ostream &os() { return OS; }
|
||||||
|
|
||||||
|
|
|
@ -44,3 +44,7 @@ tool_output_file::tool_output_file(const char *filename, std::string &ErrorInfo,
|
||||||
if (!ErrorInfo.empty())
|
if (!ErrorInfo.empty())
|
||||||
Installer.Keep = true;
|
Installer.Keep = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tool_output_file::tool_output_file(const char *Filename, int FD)
|
||||||
|
: Installer(Filename), OS(FD, true) {
|
||||||
|
}
|
||||||
|
|
|
@ -30,10 +30,10 @@
|
||||||
#include "llvm/MC/SubtargetFeature.h"
|
#include "llvm/MC/SubtargetFeature.h"
|
||||||
#include "llvm/PassManager.h"
|
#include "llvm/PassManager.h"
|
||||||
#include "llvm/Support/CommandLine.h"
|
#include "llvm/Support/CommandLine.h"
|
||||||
|
#include "llvm/Support/FileSystem.h"
|
||||||
#include "llvm/Support/FormattedStream.h"
|
#include "llvm/Support/FormattedStream.h"
|
||||||
#include "llvm/Support/Host.h"
|
#include "llvm/Support/Host.h"
|
||||||
#include "llvm/Support/MemoryBuffer.h"
|
#include "llvm/Support/MemoryBuffer.h"
|
||||||
#include "llvm/Support/PathV1.h"
|
|
||||||
#include "llvm/Support/Signals.h"
|
#include "llvm/Support/Signals.h"
|
||||||
#include "llvm/Support/TargetRegistry.h"
|
#include "llvm/Support/TargetRegistry.h"
|
||||||
#include "llvm/Support/TargetSelect.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) {
|
bool LTOCodeGenerator::compile_to_file(const char** name, std::string& errMsg) {
|
||||||
// make unique temp .o file to put generated object file
|
// make unique temp .o file to put generated object file
|
||||||
sys::PathWithStatus uniqueObjPath("lto-llvm.o");
|
SmallString<128> Filename;
|
||||||
if (uniqueObjPath.createTemporaryFileOnDisk(false, &errMsg)) {
|
int FD;
|
||||||
uniqueObjPath.eraseFromDisk();
|
error_code EC = sys::fs::unique_file("lto-llvm-%%%%%%%.o",
|
||||||
|
FD, Filename);
|
||||||
|
if (EC) {
|
||||||
|
errMsg = EC.message();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
sys::RemoveFileOnSignal(uniqueObjPath.str());
|
|
||||||
|
|
||||||
// generate object file
|
// generate object file
|
||||||
bool genResult = false;
|
tool_output_file objFile(Filename.c_str(), FD);
|
||||||
tool_output_file objFile(uniqueObjPath.c_str(), errMsg);
|
|
||||||
if (!errMsg.empty()) {
|
|
||||||
uniqueObjPath.eraseFromDisk();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
genResult = this->generateObjectFile(objFile.os(), errMsg);
|
bool genResult = generateObjectFile(objFile.os(), errMsg);
|
||||||
objFile.os().close();
|
objFile.os().close();
|
||||||
if (objFile.os().has_error()) {
|
if (objFile.os().has_error()) {
|
||||||
objFile.os().clear_error();
|
objFile.os().clear_error();
|
||||||
uniqueObjPath.eraseFromDisk();
|
sys::fs::remove(Twine(Filename));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
objFile.keep();
|
objFile.keep();
|
||||||
if (genResult) {
|
if (genResult) {
|
||||||
uniqueObjPath.eraseFromDisk();
|
sys::fs::remove(Twine(Filename));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
_nativeObjectPath = uniqueObjPath.str();
|
_nativeObjectPath = Filename.c_str();
|
||||||
*name = _nativeObjectPath.c_str();
|
*name = _nativeObjectPath.c_str();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -206,13 +203,13 @@ const void* LTOCodeGenerator::compile(size_t* length, std::string& errMsg) {
|
||||||
OwningPtr<MemoryBuffer> BuffPtr;
|
OwningPtr<MemoryBuffer> BuffPtr;
|
||||||
if (error_code ec = MemoryBuffer::getFile(name, BuffPtr, -1, false)) {
|
if (error_code ec = MemoryBuffer::getFile(name, BuffPtr, -1, false)) {
|
||||||
errMsg = ec.message();
|
errMsg = ec.message();
|
||||||
sys::Path(_nativeObjectPath).eraseFromDisk();
|
sys::fs::remove(_nativeObjectPath);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
_nativeObjectFile = BuffPtr.take();
|
_nativeObjectFile = BuffPtr.take();
|
||||||
|
|
||||||
// remove temp files
|
// remove temp files
|
||||||
sys::Path(_nativeObjectPath).eraseFromDisk();
|
sys::fs::remove(_nativeObjectPath);
|
||||||
|
|
||||||
// return buffer, unless error
|
// return buffer, unless error
|
||||||
if (_nativeObjectFile == NULL)
|
if (_nativeObjectFile == NULL)
|
||||||
|
|
Loading…
Reference in New Issue