Revert r146363 to allow buildbots to make forward progress.

Original commit message:
Support/FileSystem: Implement canonicalize.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146378 91177308-0d34-0410-b5e6-96231b3b80d8

2 files changed, 0 insertions, 58 deletions

diff --git a/lib/Support/Windows/PathV2.inc b/lib/Support/Windows/PathV2.inc
index dd367e5baa..7ca33c0bc9 100644
--- a/lib/Support/Windows/PathV2.inc
+++ b/lib/Support/Windows/PathV2.inc
@@ -614,44 +614,6 @@ retry_create_file:
   return success;
 }
 
-error_code canonicalize(const Twine &path, SmallVectorImpl<char> &result) {
-  assert(path::is_absolute(path) && "path must be absolute!");
-  SmallString<128> path_storage;
-  StringRef p = path.toStringRef(path_storage);
-  SmallVector<wchar_t, 128> path_utf16;
-  result.set_size(0);
-
-  // Convert path to UTF-16.
-  if (error_code ec = UTF8ToUTF16(p, path_utf16))
-    return ec;
-
-  DWORD size = ::GetShortPathNameW(c_str(path_utf16), NULL, 0);
-  SmallVector<wchar_t, 128> short_path;
-  short_path.reserve(size + 1);
-  size = ::GetShortPathNameW( c_str(path_utf16)
-                            , short_path.data()
-                            , short_path.capacity());
-  if (!size)
-    return windows_error(::GetLastError());
-
-  short_path.set_size(size);
-
-  size = ::GetLongPathNameW(c_str(short_path), NULL, 0);
-  path_utf16.reserve(size + 1);
-  size = ::GetLongPathNameW( c_str(short_path)
-                           , path_utf16.data()
-                           , path_utf16.capacity());
-  if (!size)
-    return windows_error(::GetLastError());
-
-  path_utf16.set_size(size);
-
-  if (error_code ec = UTF16ToUTF8(path_utf16.data(), path_utf16.size(), result))
-    return ec;
-
-  return success;
-}
-
 error_code get_magic(const Twine &path, uint32_t len,
                      SmallVectorImpl<char> &result) {
   SmallString<128> path_storage;
diff --git a/lib/Support/Windows/Windows.h b/lib/Support/Windows/Windows.h
index 2754075035..5c1da0d617 100644
--- a/lib/Support/Windows/Windows.h
+++ b/lib/Support/Windows/Windows.h
@@ -128,24 +128,6 @@ struct FindHandleTraits : CommonHandleTraits {
   }
 };
 
-struct FileMappingHandleTraits : CommonHandleTraits {
-  static handle_type GetInvalid() {
-    return 0;
-  }
-};
-
-struct MappedViewOfFileHandleTraits : CommonHandleTraits {
-  typedef LPVOID handle_type;
-
-  static handle_type GetInvalid() {
-    return 0;
-  }
-
-  static void Close(handle_type h) {
-    ::UnmapViewOfFile(h);
-  }
-};
-
 struct FileHandleTraits : CommonHandleTraits {};
 
 typedef ScopedHandle<CommonHandleTraits> ScopedCommonHandle;
@@ -153,8 +135,6 @@ typedef ScopedHandle<FileHandleTraits>   ScopedFileHandle;
 typedef ScopedHandle<CryptContextTraits> ScopedCryptContext;
 typedef ScopedHandle<FindHandleTraits>   ScopedFindHandle;
 typedef ScopedHandle<JobHandleTraits>    ScopedJobHandle;
-typedef ScopedHandle<FileMappingHandleTraits> ScopedFileMappingHandle;
-typedef ScopedHandle<MappedViewOfFileHandleTraits> ScopedMappedViewOfFileHandle;
 
 namespace llvm {
 template <class T>