[all-commits] [llvm/llvm-project] 32fb8c: [clang][modules] Lazily load by name lookups in mo...

[Michael Spencer via All-commits]

  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: 32fb8c5f5fdeb20de28846e2fe9e2c7525f62086
      https://github.com/llvm/llvm-project/commit/32fb8c5f5fdeb20de28846e2fe9e2c7525f62086
  Author: Michael Spencer <bigcheesegs at gmail.com>
  Date:   2025-05-06 (Tue, 06 May 2025)

  Changed paths:
    M clang-tools-extra/modularize/ModularizeUtilities.cpp
    M clang/include/clang/Basic/DiagnosticGroups.td
    M clang/include/clang/Basic/DiagnosticLexKinds.td
    M clang/include/clang/Lex/HeaderSearch.h
    M clang/include/clang/Lex/ModuleMap.h
    M clang/include/clang/Lex/ModuleMapFile.h
    M clang/lib/Frontend/CompilerInstance.cpp
    M clang/lib/Frontend/FrontendAction.cpp
    M clang/lib/Lex/HeaderSearch.cpp
    M clang/lib/Lex/ModuleMap.cpp
    M clang/lib/Lex/ModuleMapFile.cpp
    M clang/lib/Sema/SemaModule.cpp
    M clang/test/ClangScanDeps/modules-canononical-module-map-case.c
    A clang/test/Modules/Inputs/shadow/A1/A1.h
    M clang/test/Modules/Inputs/shadow/A1/module.modulemap
    A clang/test/Modules/Inputs/shadow/A2/A2.h
    M clang/test/Modules/Inputs/shadow/A2/module.modulemap
    A clang/test/Modules/lazy-by-name-lookup.c
    M clang/test/Modules/shadow.m
    M lldb/source/Plugins/ExpressionParser/Clang/ClangModulesDeclVendor.cpp

  Log Message:
  -----------
  [clang][modules] Lazily load by name lookups in module maps (#132853)

Instead of eagerly populating the `clang::ModuleMap` when looking up a
module by name, this patch changes `HeaderSearch` to only load the
modules that are actually used.

This introduces `ModuleMap::findOrLoadModule` which will load modules
from parsed but not loaded module maps. This cannot be used anywhere
that the module loading code calls into as it can create infinite
recursion.

This currently just reparses module maps when looking up a module by
header. This is fine as redeclarations are allowed from the same file,
but future patches will also make looking up a module by header lazy.

This patch changes the shadow.m test to use explicitly built modules and
`#import`. This test and the shadow feature are very brittle and do not
work in general. The test relied on pcm files being left behind by prior
failing clang invocations that were then reused by the last invocation.
If you clean the cache then the last invocation will always fail. This
is because the input module map and the `-fmodule-map-file=` module map
are parsed in the same module scope, and `-fmodule-map-file=` is
forwarded to implicit module builds. That means you are guaranteed to
hit a module redeclaration error if the TU actually imports the module
it is trying to shadow.

This patch changes when we load A2's module map to after the `A` module
has been loaded, which sets the `IsFromModuleFile` bit on `A`. This
means that A2's `A` is skipped entirely instead of creating a shadow
module, and we get textual inclusion. It is possible to construct a case
where this would happen before this patch too.

An upcoming patch in this series will rework shadowing to work in the
general case, but that's only possible once header -> module lookup is
lazy too.



To unsubscribe from these emails, change your notification settings at https://github.com/llvm/llvm-project/settings/notifications