[all-commits] [llvm/llvm-project] 1afb31: [clang][modules] Use file name as requested (#68957)

[Jan Svoboda via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 1afb313b26851bdb050061f6d786c83ec1f569a3
      https://github.com/llvm/llvm-project/commit/1afb313b26851bdb050061f6d786c83ec1f569a3
  Author: Jan Svoboda <jan_svoboda at apple.com>
  Date:   2023-10-20 (Fri, 20 Oct 2023)

  Changed paths:
    M clang/include/clang/ARCMigrate/FileRemapper.h
    M clang/include/clang/Basic/FileEntry.h
    M clang/include/clang/Basic/Module.h
    M clang/include/clang/Frontend/VerifyDiagnosticConsumer.h
    M clang/include/clang/Lex/ModuleMap.h
    M clang/lib/ARCMigrate/FileRemapper.cpp
    M clang/lib/Basic/Module.cpp
    M clang/lib/Lex/HeaderSearch.cpp
    M clang/lib/Lex/ModuleMap.cpp
    M clang/lib/Serialization/ASTReader.cpp
    A clang/test/Modules/Inputs/all-product-headers.yaml
    A clang/test/Modules/modulemap-collision.m

  Log Message:
  -----------
  [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()`.