r185717 - Use llvm::sys::fs::createTemporaryFile.
Rafael Espindola
rafael.espindola at gmail.com
Fri Jul 5 13:00:06 PDT 2013
Author: rafael
Date: Fri Jul 5 15:00:06 2013
New Revision: 185717
URL: http://llvm.org/viewvc/llvm-project?rev=185717&view=rev
Log:
Use llvm::sys::fs::createTemporaryFile.
Modified:
cfe/trunk/lib/ARCMigrate/FileRemapper.cpp
cfe/trunk/lib/AST/InheritViz.cpp
cfe/trunk/lib/Driver/Driver.cpp
cfe/trunk/lib/Frontend/ASTUnit.cpp
cfe/trunk/lib/Frontend/CompilerInstance.cpp
cfe/trunk/lib/Rewrite/Frontend/FrontendActions.cpp
cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
cfe/trunk/unittests/Tooling/RefactoringTest.cpp
cfe/trunk/unittests/Tooling/RewriterTestContext.h
Modified: cfe/trunk/lib/ARCMigrate/FileRemapper.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/ARCMigrate/FileRemapper.cpp?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/lib/ARCMigrate/FileRemapper.cpp (original)
+++ cfe/trunk/lib/ARCMigrate/FileRemapper.cpp Fri Jul 5 15:00:06 2013
@@ -146,11 +146,10 @@ bool FileRemapper::flushToFile(StringRef
} else {
SmallString<64> tempPath;
- tempPath = path::filename(origFE->getName());
- tempPath += "-%%%%%%%%";
- tempPath += path::extension(origFE->getName());
int fd;
- if (fs::unique_file(tempPath.str(), fd, tempPath) != llvm::errc::success)
+ if (fs::createTemporaryFile(path::filename(origFE->getName()),
+ path::extension(origFE->getName()), fd,
+ tempPath))
return report("Could not create file: " + tempPath.str(), Diag);
llvm::raw_fd_ostream newOut(fd, /*shouldClose=*/true);
Modified: cfe/trunk/lib/AST/InheritViz.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/InheritViz.cpp?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/lib/AST/InheritViz.cpp (original)
+++ cfe/trunk/lib/AST/InheritViz.cpp Fri Jul 5 15:00:06 2013
@@ -140,8 +140,8 @@ void CXXRecordDecl::viewInheritance(ASTC
int FD;
SmallString<128> Filename;
- error_code EC = sys::fs::unique_file(Self.getAsString() + "-%%%%%%.dot", FD,
- Filename);
+ error_code EC =
+ sys::fs::createTemporaryFile(Self.getAsString(), "dot", FD, Filename);
if (EC) {
llvm::errs() << "Error: " << EC.message() << "\n";
return;
Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Fri Jul 5 15:00:06 2013
@@ -1616,7 +1616,7 @@ std::string Driver::GetTemporaryPath(Str
const {
SmallString<128> Path;
llvm::error_code EC =
- llvm::sys::fs::unique_file(Prefix + "-%%%%%%." + Suffix, Path);
+ llvm::sys::fs::createTemporaryFile(Prefix, Suffix, Path);
if (EC) {
Diag(clang::diag::err_unable_to_make_temp) << EC.message();
return "";
Modified: cfe/trunk/lib/Frontend/ASTUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ASTUnit.cpp?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/ASTUnit.cpp (original)
+++ cfe/trunk/lib/Frontend/ASTUnit.cpp Fri Jul 5 15:00:06 2013
@@ -1244,7 +1244,7 @@ static std::string GetPreamblePCHPath()
return TmpFile;
SmallString<128> Path;
- llvm::sys::fs::unique_file("preamble-%%%%%%.pch", Path);
+ llvm::sys::fs::createTemporaryFile("preamble", "pch", Path);
return Path.str();
}
Modified: cfe/trunk/lib/Frontend/CompilerInstance.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInstance.cpp?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/CompilerInstance.cpp (original)
+++ cfe/trunk/lib/Frontend/CompilerInstance.cpp Fri Jul 5 15:00:06 2013
@@ -855,13 +855,9 @@ static void compileModule(CompilerInstan
IK));
} else {
// Create a temporary module map file.
- TempModuleMapFileName = Module->Name;
- TempModuleMapFileName += "-%%%%%%%%.map";
int FD;
- if (llvm::sys::fs::unique_file(TempModuleMapFileName.str(), FD,
- TempModuleMapFileName,
- /*makeAbsolute=*/true)
- != llvm::errc::success) {
+ if (llvm::sys::fs::createTemporaryFile(Module->Name, "map", FD,
+ TempModuleMapFileName)) {
ImportingInstance.getDiagnostics().Report(diag::err_module_map_temp_file)
<< TempModuleMapFileName;
return;
Modified: cfe/trunk/lib/Rewrite/Frontend/FrontendActions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Rewrite/Frontend/FrontendActions.cpp?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/lib/Rewrite/Frontend/FrontendActions.cpp (original)
+++ cfe/trunk/lib/Rewrite/Frontend/FrontendActions.cpp Fri Jul 5 15:00:06 2013
@@ -76,12 +76,10 @@ class FixItRewriteToTemp : public FixItO
public:
std::string RewriteFilename(const std::string &Filename, int &fd) {
SmallString<128> Path;
- Path = llvm::sys::path::filename(Filename);
- Path += "-%%%%%%%%";
- Path += llvm::sys::path::extension(Filename);
- SmallString<128> NewPath;
- llvm::sys::fs::unique_file(Path.str(), fd, NewPath);
- return NewPath.str();
+ llvm::sys::fs::createTemporaryFile(llvm::sys::path::filename(Filename),
+ llvm::sys::path::extension(Filename), fd,
+ Path);
+ return Path.str();
}
};
} // end anonymous namespace
Modified: cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp Fri Jul 5 15:00:06 2013
@@ -700,7 +700,7 @@ public:
static ExplodedNode::Auditor* CreateUbiViz() {
SmallString<128> P;
int FD;
- llvm::sys::fs::unique_file("llvm_ubi-%%%%%%", FD, P);
+ llvm::sys::fs::createTemporaryFile("llvm_ubi", "", FD, P);
llvm::errs() << "Writing '" << P.str() << "'.\n";
OwningPtr<llvm::raw_fd_ostream> Stream;
Modified: cfe/trunk/unittests/Tooling/RefactoringTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/RefactoringTest.cpp?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/unittests/Tooling/RefactoringTest.cpp (original)
+++ cfe/trunk/unittests/Tooling/RefactoringTest.cpp Fri Jul 5 15:00:06 2013
@@ -194,7 +194,7 @@ public:
SmallString<1024> Path;
int FD;
llvm::error_code EC =
- llvm::sys::fs::unique_file(Twine(Name) + "%%%%%%", FD, Path);
+ llvm::sys::fs::createTemporaryFile(Name, "", FD, Path);
assert(!EC);
(void)EC;
Modified: cfe/trunk/unittests/Tooling/RewriterTestContext.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Tooling/RewriterTestContext.h?rev=185717&r1=185716&r2=185717&view=diff
==============================================================================
--- cfe/trunk/unittests/Tooling/RewriterTestContext.h (original)
+++ cfe/trunk/unittests/Tooling/RewriterTestContext.h Fri Jul 5 15:00:06 2013
@@ -63,7 +63,7 @@ class RewriterTestContext {
SmallString<1024> Path;
int FD;
llvm::error_code EC =
- llvm::sys::fs::unique_file(Twine(Name) + "%%%%%%", FD, Path);
+ llvm::sys::fs::createTemporaryFile(Name, "", FD, Path);
assert(!EC);
(void)EC;
More information about the cfe-commits
mailing list