diff options
| author | Jan Svoboda <jan_svoboda@apple.com> | 2023-10-20 18:23:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 09:23:19 -0700 |
| commit | 1afb313b26851bdb050061f6d786c83ec1f569a3 (patch) | |
| tree | f66955a25346da6cdef20b7fdef846c7e97a354e /clang/lib/Lex/ModuleMap.cpp | |
| parent | cb62f67088aaf79493350547f74870318b71acc5 (diff) | |
| download | llvm-1afb313b26851bdb050061f6d786c83ec1f569a3.zip llvm-1afb313b26851bdb050061f6d786c83ec1f569a3.tar.gz llvm-1afb313b26851bdb050061f6d786c83ec1f569a3.tar.bz2 | |
[clang][modules] Use file name as requested (#68957)
This prevents redefinition errors due to having multiple paths for the
same module map. (rdar://24116019)
Originally implemented and tested downstream by @bcardosolopes, I just
made use of `FileEntryRef::getNameAsRequested()`.
Diffstat (limited to 'clang/lib/Lex/ModuleMap.cpp')
| -rw-r--r-- | clang/lib/Lex/ModuleMap.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp index f65a5f1..7fd92bf 100644 --- a/clang/lib/Lex/ModuleMap.cpp +++ b/clang/lib/Lex/ModuleMap.cpp @@ -2426,7 +2426,8 @@ void ModuleMapParser::parseHeaderDecl(MMToken::TokenKind LeadingToken, Header.Kind = Map.headerRoleToKind(Role); // Check whether we already have an umbrella. - if (Header.IsUmbrella && ActiveModule->Umbrella) { + if (Header.IsUmbrella && + !std::holds_alternative<std::monostate>(ActiveModule->Umbrella)) { Diags.Report(Header.FileNameLoc, diag::err_mmap_umbrella_clash) << ActiveModule->getFullModuleName(); HadError = true; @@ -2523,7 +2524,7 @@ void ModuleMapParser::parseUmbrellaDirDecl(SourceLocation UmbrellaLoc) { SourceLocation DirNameLoc = consumeToken(); // Check whether we already have an umbrella. - if (ActiveModule->Umbrella) { + if (!std::holds_alternative<std::monostate>(ActiveModule->Umbrella)) { Diags.Report(DirNameLoc, diag::err_mmap_umbrella_clash) << ActiveModule->getFullModuleName(); HadError = true; |