6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Don't use PathV1.h in ExtractFunction.cpp.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184102 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2013-06-17 18:48:59 +00:00
parent b339411070
commit b81784f0fe
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tools/bugpoint/ExtractFunction.cpp
View File

@@ -26,7 +26,6 @@
#include "llvm/Support/Debug.h" #include "llvm/Support/Debug.h"
#include "llvm/Support/FileUtilities.h" #include "llvm/Support/FileUtilities.h"
#include "llvm/Support/Path.h" #include "llvm/Support/Path.h"
#include "llvm/Support/PathV1.h"
#include "llvm/Support/Signals.h" #include "llvm/Support/Signals.h"
#include "llvm/Support/ToolOutputFile.h" #include "llvm/Support/ToolOutputFile.h"
#include "llvm/Transforms/IPO.h" #include "llvm/Transforms/IPO.h"
@@ -364,25 +363,19 @@ llvm::SplitFunctionsOutOfModule(Module *M,
Module *BugDriver::ExtractMappedBlocksFromModule(const Module *BugDriver::ExtractMappedBlocksFromModule(const
std::vector<BasicBlock*> &BBs, std::vector<BasicBlock*> &BBs,
Module *M) { Module *M) {
sys::Path uniqueFilename(OutputPrefix + "-extractblocks"); SmallString<128> Filename;
std::string ErrMsg; int FD;
if (uniqueFilename.createTemporaryFileOnDisk(true, &ErrMsg)) { error_code EC = sys::fs::unique_file(OutputPrefix + "-extractblocks%%%%%%%",
FD, Filename);
if (EC) {
outs() << "*** Basic Block extraction failed!\n"; outs() << "*** Basic Block extraction failed!\n";
errs() << "Error creating temporary file: " << ErrMsg << "\n"; errs() << "Error creating temporary file: " << EC.message() << "\n";
EmitProgressBitcode(M, "basicblockextractfail", true); EmitProgressBitcode(M, "basicblockextractfail", true);
return 0; return 0;
} }
sys::RemoveFileOnSignal(uniqueFilename.str()); sys::RemoveFileOnSignal(Filename);
std::string ErrorInfo; tool_output_file BlocksToNotExtractFile(Filename.c_str(), FD);
tool_output_file BlocksToNotExtractFile(uniqueFilename.c_str(), ErrorInfo);
if (!ErrorInfo.empty()) {
outs() << "*** Basic Block extraction failed!\n";
errs() << "Error writing list of blocks to not extract: " << ErrorInfo
<< "\n";
EmitProgressBitcode(M, "basicblockextractfail", true);
return 0;
}
for (std::vector<BasicBlock*>::const_iterator I = BBs.begin(), E = BBs.end(); for (std::vector<BasicBlock*>::const_iterator I = BBs.begin(), E = BBs.end();
I != E; ++I) { I != E; ++I) {
BasicBlock *BB = *I; BasicBlock *BB = *I;
@@ -394,22 +387,22 @@ Module *BugDriver::ExtractMappedBlocksFromModule(const
} }
BlocksToNotExtractFile.os().close(); BlocksToNotExtractFile.os().close();
if (BlocksToNotExtractFile.os().has_error()) { if (BlocksToNotExtractFile.os().has_error()) {
errs() << "Error writing list of blocks to not extract: " << ErrorInfo errs() << "Error writing list of blocks to not extract\n";
<< "\n";
EmitProgressBitcode(M, "basicblockextractfail", true); EmitProgressBitcode(M, "basicblockextractfail", true);
BlocksToNotExtractFile.os().clear_error(); BlocksToNotExtractFile.os().clear_error();
return 0; return 0;
} }
BlocksToNotExtractFile.keep(); BlocksToNotExtractFile.keep();
std::string uniqueFN = "--extract-blocks-file=" + uniqueFilename.str(); std::string uniqueFN = "--extract-blocks-file=";
uniqueFN += Filename.str();
const char *ExtraArg = uniqueFN.c_str(); const char *ExtraArg = uniqueFN.c_str();
std::vector<std::string> PI; std::vector<std::string> PI;
PI.push_back("extract-blocks"); PI.push_back("extract-blocks");
Module *Ret = runPassesOn(M, PI, false, 1, &ExtraArg); Module *Ret = runPassesOn(M, PI, false, 1, &ExtraArg);
uniqueFilename.eraseFromDisk(); // Free disk space sys::fs::remove(Filename.c_str());
if (Ret == 0) { if (Ret == 0) {
outs() << "*** Basic Block extraction failed, please report a bug!\n"; outs() << "*** Basic Block extraction failed, please report a bug!\n";