diff --git a/clang/lib/Sema/SemaModule.cpp b/clang/lib/Sema/SemaModule.cpp --- a/clang/lib/Sema/SemaModule.cpp +++ b/clang/lib/Sema/SemaModule.cpp @@ -387,6 +387,8 @@ if (!ModuleScopes.empty() && ModuleScopes.back().ModuleInterface) { if (ExportLoc.isValid() || getEnclosingExportDecl(Import)) getCurrentModule()->Exports.emplace_back(Mod, false); + else + getCurrentModule()->Imports.insert(Mod); } else if (ExportLoc.isValid()) { Diag(ExportLoc, diag::err_export_not_in_module_interface); } diff --git a/clang/test/Modules/module-transtive-instantiation.cpp b/clang/test/Modules/module-transtive-instantiation.cpp --- a/clang/test/Modules/module-transtive-instantiation.cpp +++ b/clang/test/Modules/module-transtive-instantiation.cpp @@ -3,11 +3,9 @@ // RUN: %clang -std=c++20 %S/Inputs/module-transtive-instantiation/Templ.cppm --precompile -o %t/Templ.pcm // RUN: %clang -std=c++20 %S/Inputs/module-transtive-instantiation/bar.cppm --precompile -fprebuilt-module-path=%t -o %t/bar.pcm // RUN: %clang -std=c++20 -fprebuilt-module-path=%t %s -c -Xclang -verify +// expected-no-diagnostics import bar; int foo() { - // FIXME: It shouldn't be an error. Since the `G` is already imported in bar. - return bar(); // expected-error@Inputs/module-transtive-instantiation/bar.cppm:5 {{definition of 'G' must be imported from module 'Templ' before it is required}} - // expected-note@-1 {{in instantiation of function template specialization 'bar' requested here}} - // expected-note@Inputs/module-transtive-instantiation/Templ.cppm:3 {{definition here is not reachable}} + return bar(); }