diff options
-rw-r--r-- | lib/ARCMigrate/FileRemapper.cpp | 7 | ||||
-rw-r--r-- | lib/AST/InheritViz.cpp | 4 | ||||
-rw-r--r-- | lib/Driver/Driver.cpp | 2 | ||||
-rw-r--r-- | lib/Frontend/ASTUnit.cpp | 2 | ||||
-rw-r--r-- | lib/Frontend/CompilerInstance.cpp | 8 | ||||
-rw-r--r-- | lib/Rewrite/Frontend/FrontendActions.cpp | 10 | ||||
-rw-r--r-- | lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp | 2 | ||||
-rw-r--r-- | unittests/Tooling/RefactoringTest.cpp | 2 | ||||
-rw-r--r-- | unittests/Tooling/RewriterTestContext.h | 2 |
9 files changed, 16 insertions, 23 deletions
diff --git a/lib/ARCMigrate/FileRemapper.cpp b/lib/ARCMigrate/FileRemapper.cpp index ee33c8f3e8..159ab79b54 100644 --- a/lib/ARCMigrate/FileRemapper.cpp +++ b/lib/ARCMigrate/FileRemapper.cpp @@ -146,11 +146,10 @@ bool FileRemapper::flushToFile(StringRef outputPath, DiagnosticsEngine &Diag) { } 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); diff --git a/lib/AST/InheritViz.cpp b/lib/AST/InheritViz.cpp index 40bda72404..3d64310dc5 100644 --- a/lib/AST/InheritViz.cpp +++ b/lib/AST/InheritViz.cpp @@ -140,8 +140,8 @@ void CXXRecordDecl::viewInheritance(ASTContext& Context) const { 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; diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 3f3d001449..1daabcb3fb 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -1616,7 +1616,7 @@ std::string Driver::GetTemporaryPath(StringRef Prefix, const char *Suffix) 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 ""; diff --git a/lib/Frontend/ASTUnit.cpp b/lib/Frontend/ASTUnit.cpp index d175073603..7d25ebb265 100644 --- a/lib/Frontend/ASTUnit.cpp +++ b/lib/Frontend/ASTUnit.cpp @@ -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(); } diff --git a/lib/Frontend/CompilerInstance.cpp b/lib/Frontend/CompilerInstance.cpp index 61c140caac..8d78a22c22 100644 --- a/lib/Frontend/CompilerInstance.cpp +++ b/lib/Frontend/CompilerInstance.cpp @@ -855,13 +855,9 @@ static void compileModule(CompilerInstance &ImportingInstance, 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; diff --git a/lib/Rewrite/Frontend/FrontendActions.cpp b/lib/Rewrite/Frontend/FrontendActions.cpp index 9935aeb63e..e9ec388182 100644 --- a/lib/Rewrite/Frontend/FrontendActions.cpp +++ b/lib/Rewrite/Frontend/FrontendActions.cpp @@ -76,12 +76,10 @@ class FixItRewriteToTemp : public FixItOptions { 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 diff --git a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp index 13f75b965c..64ba5f6484 100644 --- a/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp +++ b/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp @@ -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; diff --git a/unittests/Tooling/RefactoringTest.cpp b/unittests/Tooling/RefactoringTest.cpp index f4c086c4a3..f8d10d286e 100644 --- a/unittests/Tooling/RefactoringTest.cpp +++ b/unittests/Tooling/RefactoringTest.cpp @@ -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; diff --git a/unittests/Tooling/RewriterTestContext.h b/unittests/Tooling/RewriterTestContext.h index 629ebf1b62..841cd0f909 100644 --- a/unittests/Tooling/RewriterTestContext.h +++ b/unittests/Tooling/RewriterTestContext.h @@ -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; |