From: Peter Collingbourne Date: Thu, 7 Sep 2017 00:55:00 +0000 (+0000) Subject: LTO: Remove unnecessary Windows support code. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d91746fb9e8691ce22ad3da4c78d451836a10e80;p=llvm LTO: Remove unnecessary Windows support code. I empirically verified that open files can in fact be renamed on Windows with sys::fs::rename, so remove the incorrect code and comment. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@312683 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/LTO/Caching.cpp b/lib/LTO/Caching.cpp index 3f10c154683..98360f7e9e9 100644 --- a/lib/LTO/Caching.cpp +++ b/lib/LTO/Caching.cpp @@ -63,20 +63,6 @@ Expected lto::localCache(StringRef CacheDirectoryPath, // Make sure the file is closed before committing it. OS.reset(); -#ifdef _WIN32 - // Rename the file first on Windows because we cannot rename an open - // file on that platform using the sys::fs::rename function. - // FIXME: This code could race with the cache pruner, but it is unlikely - // that the cache pruner will choose to remove a newly created file. - // We should look at using the SetFileInformationByHandle function to - // rename the file while it is open. - if (auto EC = sys::fs::rename(TempFilename, EntryPath)) - report_fatal_error(Twine("Failed to rename temporary file ") + - TempFilename + ": " + EC.message() + "\n"); - - ErrorOr> MBOrErr = - MemoryBuffer::getFile(EntryPath); -#else // Open the file first to avoid racing with a cache pruner. ErrorOr> MBOrErr = MemoryBuffer::getFile(TempFilename); @@ -85,7 +71,6 @@ Expected lto::localCache(StringRef CacheDirectoryPath, if (auto EC = sys::fs::rename(TempFilename, EntryPath)) report_fatal_error(Twine("Failed to rename temporary file ") + TempFilename + ": " + EC.message() + "\n"); -#endif if (!MBOrErr) report_fatal_error(Twine("Failed to open cache file ") + EntryPath +