From 7c3ba222e0d3e81f5e2480ed6ecd506d05c310ad Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Tue, 29 Oct 2013 07:56:03 +0000 Subject: [PATCH] Revert "Use Rewriter::overwriteChangedFiles() directly" This wasn't ready for prime time yet, seems to break tools-extra. This reverts commit r193590. llvm-svn: 193592 --- clang/lib/Tooling/Refactoring.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/clang/lib/Tooling/Refactoring.cpp b/clang/lib/Tooling/Refactoring.cpp index fa35a74c9c48..9e58db0f4824 100644 --- a/clang/lib/Tooling/Refactoring.cpp +++ b/clang/lib/Tooling/Refactoring.cpp @@ -301,7 +301,23 @@ bool RefactoringTool::applyAllReplacements(Rewriter &Rewrite) { } int RefactoringTool::saveRewrittenFiles(Rewriter &Rewrite) { - return Rewrite.overwriteChangedFiles() ? 0 : 1; + for (Rewriter::buffer_iterator I = Rewrite.buffer_begin(), + E = Rewrite.buffer_end(); + I != E; ++I) { + // FIXME: This code is copied from the FixItRewriter.cpp - I think it should + // go into directly into Rewriter (there we also have the Diagnostics to + // handle the error cases better). + const FileEntry *Entry = + Rewrite.getSourceMgr().getFileEntryForID(I->first); + std::string ErrorInfo; + llvm::raw_fd_ostream FileStream(Entry->getName(), ErrorInfo, + llvm::sys::fs::F_Binary); + if (!ErrorInfo.empty()) + return 1; + I->second.write(FileStream); + FileStream.flush(); + } + return 0; } } // end namespace tooling