aboutsummaryrefslogtreecommitdiff
path: root/clang/tools
diff options
context:
space:
mode:
authorAlp Toker <alp@nuanti.com>2013-11-08 08:07:19 +0000
committerAlp Toker <alp@nuanti.com>2013-11-08 08:07:19 +0000
commit07ce1d0282ca9819e98fa8b32d2d3a50229953e3 (patch)
treec5f3348f264b20beecad6ec3ca152649b428b392 /clang/tools
parente994ebda149c86ba3cb9ab80c5f0c597e1c342bc (diff)
downloadllvm-07ce1d0282ca9819e98fa8b32d2d3a50229953e3.zip
llvm-07ce1d0282ca9819e98fa8b32d2d3a50229953e3.tar.gz
llvm-07ce1d0282ca9819e98fa8b32d2d3a50229953e3.tar.bz2
clang-format: Write files atomically
Switch clang-format over to Rewriter::overwriteChangedFiles(). The previous implementation was attempting to stream back directly to the original file and failing if it was already memory mapped by MemoryBuffer, an operation unsupported by Windows. MemoryBuffer generally mmaps files larger than the physical page size so this will have been difficult to reproduce consistently. This change also reduces flicker in code editors and IDEs on all platforms when reformatting in-place. Note that other incorrect uses of MemoryBuffer exist in LLVM/clang and will need a similar fix. A test should be added for Windows when libFormat performance issues are fixed (it takes longer than a day to format a 1MB file at present!) llvm-svn: 194250
Diffstat (limited to 'clang/tools')
-rw-r--r--clang/tools/clang-format/ClangFormat.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/clang/tools/clang-format/ClangFormat.cpp b/clang/tools/clang-format/ClangFormat.cpp
index 2ca2bed..85c47ab 100644
--- a/clang/tools/clang-format/ClangFormat.cpp
+++ b/clang/tools/clang-format/ClangFormat.cpp
@@ -213,18 +213,8 @@ static bool format(std::string FileName) {
Rewriter Rewrite(Sources, LangOptions());
tooling::applyAllReplacements(Replaces, Rewrite);
if (Inplace) {
- if (Replaces.size() == 0)
- return false; // Nothing changed, don't touch the file.
-
- std::string ErrorInfo;
- llvm::raw_fd_ostream FileStream(FileName.c_str(), ErrorInfo,
- llvm::sys::fs::F_Binary);
- if (!ErrorInfo.empty()) {
- llvm::errs() << "Error while writing file: " << ErrorInfo << "\n";
+ if (Rewrite.overwriteChangedFiles())
return true;
- }
- Rewrite.getEditBuffer(ID).write(FileStream);
- FileStream.flush();
} else {
if (Cursor.getNumOccurrences() != 0)
outs() << "{ \"Cursor\": " << tooling::shiftedCodePosition(