From 0c6387f7599b33436519859757391ea9133c5df8 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Tue, 9 Dec 2014 00:14:36 +0000 Subject: [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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'clang/lib/Frontend/CompilerInstance.cpp') diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index a5165ad6211..93a34b72227 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -1300,7 +1300,9 @@ bool CompilerInstance::loadModuleFile(StringRef FileName) { 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(); -- cgit v1.2.3