commit 0c6387f7599b33436519859757391ea9133c5df8
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Dec 09 00:14:36 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Dec 09 00:14:36 2014 +0000
tree 6cc37c7687f9fcec57f7d64cf3403ebe04a3ce05
parent ae394819c817c20c37cc8f7c4b5180c331321abd

[modules] If the same .pcm file is imported via two different paths, don't
complain that the contained modules are defined twice.

llvm-svn: 223724

clang/lib/Frontend/CompilerInstance.cpp

diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
index a5165ad..93a34b7 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -1300,7 +1300,9 @@
         TopFileIsModule = true;
 
       auto &ModuleFile = CI.ModuleFileOverrides[ModuleName];
-      if (!ModuleFile.empty() && ModuleFile != ModuleFileStack.back())
+      if (!ModuleFile.empty() &&
+          CI.getFileManager().getFile(ModuleFile) !=
+              CI.getFileManager().getFile(ModuleFileStack.back()))
         CI.getDiagnostics().Report(SourceLocation(),
                                    diag::err_conflicting_module_files)
             << ModuleName << ModuleFile << ModuleFileStack.back();