averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[upstream-update] Do not specify OpenFlags since it was removed upstream.

Browse Source 
This was removed upstream in https://reviews.llvm.org/D47789 since the only
place this flag was used was in the windows implementation where the behavior
triggered by this could be hidden in the implementation instead of being an
argument. As such, this code doesn't compile on master-next.

Since this has an acceptable default argument given the current stable, we can
just fix this on master and everything will work.

rdar://42862352
This commit is contained in:
Michael Gottesman
2018-08-02 10:17:14 -07:00
parent 99b1ce7ab7
commit 7e70389b80
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Basic/FileSystem.cpp
View File

@@ -79,14 +79,12 @@ canUseTemporaryForWrite(const StringRef outputPath) {
/// temporary file that was just created.
/// \param outputPath The path to the final output file, which is used to decide
/// where to put the temporary.
/// \param openFlags Controls how the output stream will be opened.
///
/// \returns The path to the temporary file that was opened, or \c None if the
/// file couldn't be created.
static Optional<std::string>
tryToOpenTemporaryFile(Optional<llvm::raw_fd_ostream> &openedStream,
const StringRef outputPath,
const llvm::sys::fs::OpenFlags openFlags) {
const StringRef outputPath) {
namespace fs = llvm::sys::fs;
// Create a temporary file path.
@@ -102,8 +100,7 @@ tryToOpenTemporaryFile(Optional<llvm::raw_fd_ostream> &openedStream,
int fd;
const unsigned perms = fs::all_read | fs::all_write;
std::error_code EC = fs::createUniqueFile(tempPath, fd, tempPath, perms,
openFlags);
std::error_code EC = fs::createUniqueFile(tempPath, fd, tempPath, perms);
if (EC) {
// Ignore the specific error; the caller has to fall back to not using a
@@ -118,7 +115,7 @@ tryToOpenTemporaryFile(Optional<llvm::raw_fd_ostream> &openedStream,
}
std::error_code swift::atomicallyWritingToFile(
const StringRef outputPath, const bool binaryMode,
const StringRef outputPath,
const llvm::function_ref<void(llvm::raw_pwrite_stream &)> action) {
namespace fs = llvm::sys::fs;
@@ -133,11 +130,9 @@ std::error_code swift::atomicallyWritingToFile(
Optional<std::string> temporaryPath;
{
const fs::OpenFlags openFlags = (binaryMode ? fs::F_None : fs::F_Text);
Optional<llvm::raw_fd_ostream> OS;
if (canUseTemporary.get()) {
temporaryPath = tryToOpenTemporaryFile(OS, outputPath, openFlags);
temporaryPath = tryToOpenTemporaryFile(OS, outputPath);
if (!temporaryPath) {
assert(!OS.hasValue());
@@ -149,7 +144,7 @@ std::error_code swift::atomicallyWritingToFile(
if (!OS.hasValue()) {
std::error_code error;
OS.emplace(outputPath, error, openFlags);
OS.emplace(outputPath, error, fs::F_None);
if (error)
return error;
}