Normalize paths to fix Windows bot

Author: Jan Svoboda

clang/lib/Serialization/ASTReader.cpp

@@ -4350,10 +4350,15 @@ void ASTReader::ReadModuleOffsetMap(ModuleFile &F) const {
     uint16_t Len = endian::readNext<uint16_t, llvm::endianness::little>(Data);
     StringRef Name = StringRef((const char*)Data, Len);
     Data += Len;
-    ModuleFile *OM = (Kind == MK_PrebuiltModule || Kind == MK_ExplicitModule ||
-                              Kind == MK_ImplicitModule
-                          ? ModuleMgr.lookupByModuleName(Name)
-                          : ModuleMgr.lookupByFileName(Name));
+    ModuleFile *OM;
+    if (Kind == MK_PrebuiltModule || Kind == MK_ExplicitModule ||
+        Kind == MK_ImplicitModule) {
+      OM = ModuleMgr.lookupByModuleName(Name);
+    } else {
+      SmallString<128> NormalizedName = Name;
+      llvm::sys::path::make_preferred(NormalizedName);
+      OM = ModuleMgr.lookupByFileName(NormalizedName);
+    }
     if (!OM) {
       std::string Msg = "refers to unknown module, cannot find ";
       Msg.append(std::string(Name));

clang/lib/Serialization/InMemoryModuleCache.cpp

@@ -7,13 +7,18 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Serialization/InMemoryModuleCache.h"
+#include "llvm/ADT/SmallString.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/Path.h"
 
 using namespace clang;
 
 InMemoryModuleCache::State
 InMemoryModuleCache::getPCMState(llvm::StringRef Filename) const {
-  auto I = PCMs.find(Filename);
+  llvm::SmallString<128> NormalizedFilename = Filename;
+  llvm::sys::path::make_preferred(NormalizedFilename);
+
+  auto I = PCMs.find(NormalizedFilename);
   if (I == PCMs.end())
     return Unknown;
   if (I->second.IsFinal)
@@ -24,15 +29,21 @@ InMemoryModuleCache::getPCMState(llvm::StringRef Filename) const {
 llvm::MemoryBuffer &
 InMemoryModuleCache::addPCM(llvm::StringRef Filename,
                             std::unique_ptr<llvm::MemoryBuffer> Buffer) {
-  auto Insertion = PCMs.insert(std::make_pair(Filename, std::move(Buffer)));
+  llvm::SmallString<128> NormalizedFilename = Filename;
+  llvm::sys::path::make_preferred(NormalizedFilename);
+
+  auto Insertion = PCMs.insert({NormalizedFilename, std::move(Buffer)});
   assert(Insertion.second && "Already has a PCM");
   return *Insertion.first->second.Buffer;
 }
 
 llvm::MemoryBuffer &
 InMemoryModuleCache::addBuiltPCM(llvm::StringRef Filename,
                                  std::unique_ptr<llvm::MemoryBuffer> Buffer) {
-  auto &PCM = PCMs[Filename];
+  llvm::SmallString<128> NormalizedFilename = Filename;
+  llvm::sys::path::make_preferred(NormalizedFilename);
+
+  auto &PCM = PCMs[NormalizedFilename];
   assert(!PCM.IsFinal && "Trying to override finalized PCM?");
   assert(!PCM.Buffer && "Trying to override tentative PCM?");
   PCM.Buffer = std::move(Buffer);
@@ -42,7 +53,10 @@ InMemoryModuleCache::addBuiltPCM(llvm::StringRef Filename,
 
 llvm::MemoryBuffer *
 InMemoryModuleCache::lookupPCM(llvm::StringRef Filename) const {
-  auto I = PCMs.find(Filename);
+  llvm::SmallString<128> NormalizedFilename = Filename;
+  llvm::sys::path::make_preferred(NormalizedFilename);
+
+  auto I = PCMs.find(NormalizedFilename);
   if (I == PCMs.end())
     return nullptr;
   return I->second.Buffer.get();
@@ -57,7 +71,10 @@ bool InMemoryModuleCache::shouldBuildPCM(llvm::StringRef Filename) const {
 }
 
 bool InMemoryModuleCache::tryToDropPCM(llvm::StringRef Filename) {
-  auto I = PCMs.find(Filename);
+  llvm::SmallString<128> NormalizedFilename = Filename;
+  llvm::sys::path::make_preferred(NormalizedFilename);
+
+  auto I = PCMs.find(NormalizedFilename);
   assert(I != PCMs.end() && "PCM to remove is unknown...");
 
   auto &PCM = I->second;
@@ -71,7 +88,10 @@ bool InMemoryModuleCache::tryToDropPCM(llvm::StringRef Filename) {
 }
 
 void InMemoryModuleCache::finalizePCM(llvm::StringRef Filename) {
-  auto I = PCMs.find(Filename);
+  llvm::SmallString<128> NormalizedFilename = Filename;
+  llvm::sys::path::make_preferred(NormalizedFilename);
+
+  auto I = PCMs.find(NormalizedFilename);
   assert(I != PCMs.end() && "PCM to finalize is unknown...");
 
   auto &PCM = I->second;

clang/lib/Serialization/ModuleManager.cpp

@@ -60,7 +60,9 @@ ModuleFile *ModuleManager::lookupByModuleName(StringRef Name) const {
 }
 
 ModuleFile *ModuleManager::lookup(FileEntryRef File) const {
-  return Modules.lookup(File.getName());
+  llvm::SmallString<128> NormalizedFileName = File.getName();
+  llvm::sys::path::make_preferred(NormalizedFileName);
+  return Modules.lookup(NormalizedFileName);
 }
 
 std::unique_ptr<llvm::MemoryBuffer>
@@ -108,7 +110,9 @@ ModuleManager::addModule(StringRef FileName, ModuleKind Type,
   Module = nullptr;
 
   // Check whether we already loaded this module, before
-  if (ModuleFile *ModuleEntry = Modules.lookup(FileName)) {
+  llvm::SmallString<128> NormalizedFileName = FileName;
+  llvm::sys::path::make_preferred(NormalizedFileName);
+  if (ModuleFile *ModuleEntry = Modules.lookup(NormalizedFileName)) {
     // Check the stored signature.
     if (checkSignature(ModuleEntry->Signature, ExpectedSignature, ErrorStr))
       return OutOfDate;
@@ -203,7 +207,7 @@ ModuleManager::addModule(StringRef FileName, ModuleKind Type,
     return OutOfDate;
 
   // We're keeping this module.  Store it everywhere.
-  Module = Modules[FileName] = NewModule.get();
+  Module = Modules[NormalizedFileName] = NewModule.get();
 
   updateModuleImports(*NewModule, ImportedBy, ImportLoc);