Merge pull request #19856 from akyrtzi/swift-format-fix

akyrtzi · web-flow · commit 0030a7755701 · 2018-10-12T10:11:38.000-07:00
[swift-format] Fix issue with swift-format invocation re-using source buffers from previous iterations
diff --git a/test/swift-format/main.swift b/test/swift-format/main.swift
@@ -1,5 +1,3 @@
-// REQUIRES: rdar39260564
-
 // RUN: %swift-format %s >%t.response
 // RUN: diff -u %s.response %t.response
 // RUN: %swift-format -indent-width 2 %s >%t.response
diff --git a/tools/driver/swift_format_main.cpp b/tools/driver/swift_format_main.cpp
@@ -211,7 +211,7 @@ class SwiftFormatInvocation {
           Formatted = "";
 
         Output.replace(Offset, Length, Formatted);
-        Doc.updateCode(llvm::MemoryBuffer::getMemBuffer(Output));        
+        Doc.updateCode(llvm::MemoryBuffer::getMemBufferCopy(Output));
       }
       if (Filename == "-" || (!InPlace && OutputFilename == "-")) {
         llvm::outs() << Output;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// REQUIRES: rdar39260564`
`2`		`-`
`3`	`1`	`// RUN: %swift-format %s >%t.response`
`4`	`2`	`// RUN: diff -u %s.response %t.response`
`5`	`3`	`// RUN: %swift-format -indent-width 2 %s >%t.response`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ class SwiftFormatInvocation {`
`211`	`211`	`Formatted = "";`
`212`	`212`
`213`	`213`	`Output.replace(Offset, Length, Formatted);`
`214`		`- Doc.updateCode(llvm::MemoryBuffer::getMemBuffer(Output));`
	`214`	`+ Doc.updateCode(llvm::MemoryBuffer::getMemBufferCopy(Output));`
`215`	`215`	`}`
`216`	`216`	`if (Filename == "-" \|\| (!InPlace && OutputFilename == "-")) {`
`217`	`217`	`llvm::outs() << Output;`