[all-commits] [llvm/llvm-project] a171d2: [clang][modules] Deprecate module.map in favor of ...

Michael Spencer via All-commits all-commits at lists.llvm.org
Thu Dec 14 14:04:10 PST 2023


  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: a171d248ca34b8b6f8de11d42a83ad981285963a
      https://github.com/llvm/llvm-project/commit/a171d248ca34b8b6f8de11d42a83ad981285963a
  Author: Michael Spencer <bigcheesegs at gmail.com>
  Date:   2023-12-14 (Thu, 14 Dec 2023)

  Changed paths:
    M clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp
    M clang-tools-extra/docs/modularize.rst
    R clang-tools-extra/include-cleaner/test/Inputs/modules/module.map
    A clang-tools-extra/include-cleaner/test/Inputs/modules/module.modulemap
    M clang-tools-extra/modularize/Modularize.cpp
    M clang-tools-extra/modularize/ModularizeUtilities.cpp
    M clang-tools-extra/modularize/ModularizeUtilities.h
    M clang-tools-extra/test/modularize/Inputs/CompileError/module.modulemap
    M clang-tools-extra/test/modularize/Inputs/CoverageNoProblems/module.modulemap
    M clang-tools-extra/test/modularize/Inputs/CoverageProblems/module.modulemap
    M clang-tools-extra/test/modularize/Inputs/MissingHeader/module.modulemap
    R clang-tools-extra/test/pp-trace/Inputs/module.map
    A clang-tools-extra/test/pp-trace/Inputs/module.modulemap
    M clang/include/clang-c/BuildSystem.h
    M clang/include/clang/Basic/DiagnosticGroups.td
    M clang/include/clang/Basic/DiagnosticLexKinds.td
    M clang/lib/Lex/HeaderSearch.cpp
    R clang/test/ARCMT/Inputs/module.map
    A clang/test/ARCMT/Inputs/module.modulemap
    R clang/test/Index/Inputs/Frameworks/module.map
    A clang/test/Index/Inputs/Frameworks/module.modulemap
    R clang/test/Index/Inputs/Headers/module.map
    A clang/test/Index/Inputs/Headers/module.modulemap
    R clang/test/Index/Inputs/Headers/nested/module.map
    A clang/test/Index/Inputs/Headers/nested/module.modulemap
    R clang/test/Index/Inputs/module.map
    A clang/test/Index/Inputs/module.modulemap
    M clang/test/Index/Inputs/vfsoverlay.yaml
    R clang/test/Modules/Inputs/Conflicts/module.map
    A clang/test/Modules/Inputs/Conflicts/module.modulemap
    A clang/test/Modules/Inputs/DependsOnModule.framework/Modules/module.modulemap
    A clang/test/Modules/Inputs/DependsOnModule.framework/Modules/module.private.modulemap
    R clang/test/Modules/Inputs/DependsOnModule.framework/module.map
    R clang/test/Modules/Inputs/DependsOnModule.framework/module_private.map
    A clang/test/Modules/Inputs/GNUAsm/NeedsGNUInlineAsm.framework/Modules/module.modulemap
    R clang/test/Modules/Inputs/GNUAsm/NeedsGNUInlineAsm.framework/module.map
    R clang/test/Modules/Inputs/Modified/module.map
    A clang/test/Modules/Inputs/Modified/module.modulemap
    R clang/test/Modules/Inputs/ModuleDiags/module.map
    A clang/test/Modules/Inputs/ModuleDiags/module.modulemap
    A clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/a.h
    A clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/module.map
    A clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/module_private.map
    A clang/test/Modules/Inputs/ModuleMapLocations/Module_Map/private.h
    A clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/Headers/a.h
    A clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/PrivateHeaders/private.h
    A clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/module.map
    A clang/test/Modules/Inputs/ModuleMapLocations/Module_Map_F.framework/module_private.map
    A clang/test/Modules/Inputs/NoUmbrella.framework/Modules/module.modulemap
    A clang/test/Modules/Inputs/NoUmbrella.framework/Modules/module.private.modulemap
    R clang/test/Modules/Inputs/NoUmbrella.framework/module.map
    R clang/test/Modules/Inputs/NoUmbrella.framework/module_private.map
    R clang/test/Modules/Inputs/StdDef/module.map
    A clang/test/Modules/Inputs/StdDef/module.modulemap
    R clang/test/Modules/Inputs/System/usr/include/module.map
    A clang/test/Modules/Inputs/System/usr/include/module.modulemap
    R clang/test/Modules/Inputs/UseAfterFree/module.map
    A clang/test/Modules/Inputs/UseAfterFree/module.modulemap
    A clang/test/Modules/Inputs/UseAfterFree/module.private.modulemap
    R clang/test/Modules/Inputs/UseAfterFree/module_private.map
    R clang/test/Modules/Inputs/crash-recovery/usr/include/module.map
    A clang/test/Modules/Inputs/crash-recovery/usr/include/module.modulemap
    R clang/test/Modules/Inputs/declare-use/module.map
    A clang/test/Modules/Inputs/declare-use/module.modulemap
    R clang/test/Modules/Inputs/elsewhere/module.map
    A clang/test/Modules/Inputs/elsewhere/module.modulemap
    R clang/test/Modules/Inputs/exclude-header/module.map
    A clang/test/Modules/Inputs/exclude-header/module.modulemap
    A clang/test/Modules/Inputs/implicit-private-without-public/DeprecatedModuleMapLocation.framework/module.private.modulemap
    R clang/test/Modules/Inputs/implicit-private-without-public/DeprecatedModuleMapLocation.framework/module_private.map
    R clang/test/Modules/Inputs/include-relative/module.map
    A clang/test/Modules/Inputs/include-relative/module.modulemap
    R clang/test/Modules/Inputs/lookup-assert-protocol/module.map
    A clang/test/Modules/Inputs/lookup-assert-protocol/module.modulemap
    R clang/test/Modules/Inputs/lookup-assert/module.map
    A clang/test/Modules/Inputs/lookup-assert/module.modulemap
    R clang/test/Modules/Inputs/macro-undef-through-pch/module.map
    A clang/test/Modules/Inputs/macro-undef-through-pch/module.modulemap
    R clang/test/Modules/Inputs/malformed/module.map
    A clang/test/Modules/Inputs/malformed/module.modulemap
    R clang/test/Modules/Inputs/module.map
    A clang/test/Modules/Inputs/module.modulemap
    R clang/test/Modules/Inputs/ms-enums/module.map
    A clang/test/Modules/Inputs/ms-enums/module.modulemap
    R clang/test/Modules/Inputs/normal-module-map/Umbrella/module.map
    A clang/test/Modules/Inputs/normal-module-map/Umbrella/module.modulemap
    R clang/test/Modules/Inputs/normal-module-map/Umbrella2/module.map
    A clang/test/Modules/Inputs/normal-module-map/Umbrella2/module.modulemap
    R clang/test/Modules/Inputs/normal-module-map/module.map
    A clang/test/Modules/Inputs/normal-module-map/module.modulemap
    R clang/test/Modules/Inputs/normal-module-map/nested/module.map
    A clang/test/Modules/Inputs/normal-module-map/nested/module.modulemap
    R clang/test/Modules/Inputs/objc-category-2/module.map
    A clang/test/Modules/Inputs/objc-category-2/module.modulemap
    R clang/test/Modules/Inputs/objc-category-3/module.map
    A clang/test/Modules/Inputs/objc-category-3/module.modulemap
    R clang/test/Modules/Inputs/objc-category/module.map
    A clang/test/Modules/Inputs/objc-category/module.modulemap
    R clang/test/Modules/Inputs/objc-hidden/System/module.map
    A clang/test/Modules/Inputs/objc-hidden/System/module.modulemap
    R clang/test/Modules/Inputs/odr/module.map
    A clang/test/Modules/Inputs/odr/module.modulemap
    R clang/test/Modules/Inputs/oldname/module.map
    A clang/test/Modules/Inputs/oldname/module.modulemap
    R clang/test/Modules/Inputs/pr19692/module.map
    A clang/test/Modules/Inputs/pr19692/module.modulemap
    R clang/test/Modules/Inputs/private/module.map
    A clang/test/Modules/Inputs/private/module.modulemap
    R clang/test/Modules/Inputs/private1/module.map
    A clang/test/Modules/Inputs/private1/module.modulemap
    R clang/test/Modules/Inputs/private2/module.map
    A clang/test/Modules/Inputs/private2/module.modulemap
    R clang/test/Modules/Inputs/redecls/module.map
    A clang/test/Modules/Inputs/redecls/module.modulemap
    A clang/test/Modules/Inputs/self-import-header/af.framework/Modules/module.modulemap
    R clang/test/Modules/Inputs/self-import-header/af.framework/module.map
    R clang/test/Modules/Inputs/self-import-header/depend_builtin/module.map
    A clang/test/Modules/Inputs/self-import-header/depend_builtin/module.modulemap
    R clang/test/Modules/Inputs/string_names/module.map
    A clang/test/Modules/Inputs/string_names/module.modulemap
    R clang/test/Modules/Inputs/subdir/module.map
    A clang/test/Modules/Inputs/subdir/module.modulemap
    R clang/test/Modules/Inputs/subdirectory-module-maps-working-dir/subdir_module/module.map
    A clang/test/Modules/Inputs/subdirectory-module-maps-working-dir/subdir_module/module.modulemap
    R clang/test/Modules/Inputs/submodules/module.map
    A clang/test/Modules/Inputs/submodules/module.modulemap
    R clang/test/Modules/Inputs/system-out-of-date/module.map
    A clang/test/Modules/Inputs/system-out-of-date/module.modulemap
    R clang/test/Modules/Inputs/template-specialization-visibility/module.map
    A clang/test/Modules/Inputs/template-specialization-visibility/module.modulemap
    R clang/test/Modules/Inputs/thread-safety/module.map
    A clang/test/Modules/Inputs/thread-safety/module.modulemap
    R clang/test/Modules/Inputs/undefined-type-fixit/module.map
    A clang/test/Modules/Inputs/undefined-type-fixit/module.modulemap
    R clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.map
    A clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.modulemap
    R clang/test/Modules/Inputs/update-after-load/module.map
    A clang/test/Modules/Inputs/update-after-load/module.modulemap
    R clang/test/Modules/Inputs/wildcard-submodule-exports/module.map
    A clang/test/Modules/Inputs/wildcard-submodule-exports/module.modulemap
    M clang/test/Modules/concept_differ.cpp
    M clang/test/Modules/config_macros.m
    M clang/test/Modules/crash-vfs-ivfsoverlay.m
    M clang/test/Modules/crash-vfs-path-symlink-component.m
    M clang/test/Modules/crash-vfs-path-traversal.m
    M clang/test/Modules/crash-vfs-relative-incdir.m
    M clang/test/Modules/crash-vfs-relative-overlay.m
    M clang/test/Modules/crash-vfs-run-reproducer.m
    M clang/test/Modules/declare-use-compatible.cpp
    M clang/test/Modules/dependency-gen-pch.m
    M clang/test/Modules/dependency-gen.m
    M clang/test/Modules/diag-flags.cpp
    M clang/test/Modules/diag-pragma.c
    M clang/test/Modules/diag-pragma.cpp
    M clang/test/Modules/diamond-pch.c
    M clang/test/Modules/diamond.c
    M clang/test/Modules/extern_c_bad.cpp
    M clang/test/Modules/fmodules-validate-once-per-build-session.c
    M clang/test/Modules/fsystem-module.m
    M clang/test/Modules/irgen.c
    M clang/test/Modules/linkage-merge.m
    M clang/test/Modules/load_failure.c
    M clang/test/Modules/lookup.cpp
    M clang/test/Modules/lookup.m
    M clang/test/Modules/merge-concepts.cppm
    M clang/test/Modules/missing-header.m
    M clang/test/Modules/modify-module.m
    M clang/test/Modules/module-file-home-is-cwd.m
    M clang/test/Modules/module-private.cpp
    M clang/test/Modules/module_file_info.m
    M clang/test/Modules/modulemap-locations.m
    M clang/test/Modules/no-stale-modtime.m
    M clang/test/Modules/objc-at-keyword.m
    M clang/test/Modules/objc-categories.m
    M clang/test/Modules/objc-type-param.m
    M clang/test/Modules/objc_redef.m
    M clang/test/Modules/odr_hash-blocks.cpp
    M clang/test/Modules/odr_hash-gnu.cpp
    M clang/test/Modules/odr_hash-vector.cpp
    M clang/test/Modules/odr_hash.cl
    M clang/test/Modules/odr_hash.cpp
    M clang/test/Modules/odr_hash.mm
    M clang/test/Modules/pragma-pack.cpp
    M clang/test/Modules/recursive.c
    M clang/test/Modules/redecl-namespaces.mm
    M clang/test/Modules/redeclarations.m
    M clang/test/Modules/relative-submodule-topheader.m
    M clang/test/Modules/requires-coroutines.mm
    M clang/test/Modules/requires-gnuinlineasm.m
    M clang/test/Modules/requires.m
    M clang/test/Modules/requires.mm
    M clang/test/Modules/target-platform-features.m
    M clang/test/Modules/timestamps.c
    M clang/test/Modules/validate-system-headers.m
    M clang/test/PCH/modified-module-dependency.m
    M clang/test/Preprocessor/pragma_module.c
    R clang/test/SemaObjC/Inputs/module.map
    A clang/test/SemaObjC/Inputs/module.modulemap
    M clang/test/VFS/Inputs/vfsoverlay.yaml
    M clang/test/VFS/Inputs/vfsoverlay2.yaml
    M clang/test/VFS/test_nonmodular.c
    M clang/unittests/Tooling/ToolingTest.cpp

  Log Message:
  -----------
  [clang][modules] Deprecate module.map in favor of module.modulemap (#75142)

This patch deprecates `module.map` in favor of `module.modulemap`, which
has been the preferred form since 2014. The eventual goal is to remove
support for `module.map` to reduce the number of stats Clang needs to do
while searching for module map files.

This patch touches a lot of files, but the majority of them are just
renaming tests or references to the file in comments or documentation.

The relevant files are:
* lib/Lex/HeaderSearch.cpp
* include/clang/Basic/DiagnosticGroups.td
* include/clang/Basic/DiagnosticLexKinds.td




More information about the All-commits mailing list