diff --git a/clang/include/clang/Basic/Module.h b/clang/include/clang/Basic/Module.h --- a/clang/include/clang/Basic/Module.h +++ b/clang/include/clang/Basic/Module.h @@ -529,6 +529,10 @@ /// Is this module a header unit. bool isHeaderUnit() const { return Kind == ModuleHeaderUnit; } + // Is this a C++20 module interface or a partition. + bool isInterfaceOrPartition() const { + return Kind == ModuleInterfaceUnit || isModulePartition(); + } /// Get the primary module interface name from a partition. StringRef getPrimaryModuleInterfaceName() const { diff --git a/clang/lib/Serialization/ASTWriterDecl.cpp b/clang/lib/Serialization/ASTWriterDecl.cpp --- a/clang/lib/Serialization/ASTWriterDecl.cpp +++ b/clang/lib/Serialization/ASTWriterDecl.cpp @@ -1029,12 +1029,12 @@ if (Writer.WritingModule && !D->getDescribedVarTemplate() && !D->getMemberSpecializationInfo() && !isa(D)) { - // When building a C++ Modules TS module interface unit, a strong - // definition in the module interface is provided by the compilation of - // that module interface unit, not by its users. (Inline variables are - // still emitted in module users.) + // When building a C++20 module interface unit or a partition unit, a + // strong definition in the module interface is provided by the + // compilation of that unit, not by its users. (Inline variables are still + // emitted in module users.) ModulesCodegen = - (Writer.WritingModule->Kind == Module::ModuleInterfaceUnit || + (Writer.WritingModule->isInterfaceOrPartition() || (D->hasAttr() && Writer.Context->getLangOpts().BuildingPCHWithObjectFile)) && Writer.Context->GetGVALinkageForVariable(D) == GVA_StrongExternal; @@ -2470,11 +2470,11 @@ if (!FD->isDependentContext()) { Optional Linkage; if (Writer->WritingModule && - Writer->WritingModule->Kind == Module::ModuleInterfaceUnit) { - // When building a C++ Modules TS module interface unit, a strong - // definition in the module interface is provided by the compilation of - // that module interface unit, not by its users. (Inline functions are - // still emitted in module users.) + Writer->WritingModule->isInterfaceOrPartition()) { + // When building a C++20 module interface unit or a partition unit, a + // strong definition in the module interface is provided by the + // compilation of that unit, not by its users. (Inline functions are still + // emitted in module users.) Linkage = Writer->Context->GetGVALinkageForFunction(FD); ModulesCodegen = *Linkage == GVA_StrongExternal; } diff --git a/clang/test/CodeGenCXX/partitions.cpp b/clang/test/CodeGenCXX/partitions.cpp new file mode 100644 --- /dev/null +++ b/clang/test/CodeGenCXX/partitions.cpp @@ -0,0 +1,50 @@ +// RUN: rm -rf %t +// RUN: mkdir %t +// RUN: split-file %s %t + +// RUN: %clang_cc1 -std=c++20 -emit-module-interface -triple %itanium_abi_triple %t/parta.cppm -o %t/mod-parta.pcm +// RUN: %clang_cc1 -std=c++20 -emit-module-interface -triple %itanium_abi_triple %t/partb.cppm -o %t/mod-partb.pcm +// RUN: %clang_cc1 -std=c++20 -emit-module-interface -triple %itanium_abi_triple -fmodule-file=%t/mod-parta.pcm \ +// RUN: -fmodule-file=%t/mod-partb.pcm %t/mod.cppm -o %t/mod.pcm +// RUN: %clang_cc1 -std=c++20 -triple %itanium_abi_triple %t/mod.pcm -S -emit-llvm -disable-llvm-passes -o - \ +// RUN: | FileCheck %t/mod.cppm +// RUN: %clang_cc1 -std=c++20 -O2 -emit-module-interface -triple %itanium_abi_triple -fmodule-file=%t/mod-parta.pcm \ +// RUN: -fmodule-file=%t/mod-partb.pcm %t/mod.cppm -o %t/mod.pcm +// RUN: %clang_cc1 -std=c++20 -O2 -triple %itanium_abi_triple %t/mod.pcm -S -emit-llvm -disable-llvm-passes -o - \ +// RUN: | FileCheck %t/mod.cppm -check-prefix=CHECK-OPT + +//--- parta.cppm +export module mod:parta; + +export int a = 43; + +export int foo() { + return 3 + a; +} + +//--- partb.cppm +module mod:partb; + +int b = 43; + +int bar() { + return 43 + b; +} + +//--- mod.cppm +export module mod; +import :parta; +import :partb; +export int use() { + return foo() + bar() + a + b; +} + +// CHECK: @_ZW3mod1a = available_externally global +// CHECK: @_ZW3mod1b = available_externally global +// CHECK: declare{{.*}} i32 @_ZW3mod3foov +// CHECK: declare{{.*}} i32 @_ZW3mod3barv + +// CHECK-OPT: @_ZW3mod1a = available_externally global +// CHECK-OPT: @_ZW3mod1b = available_externally global +// CHECK-OPT: define available_externally{{.*}} i32 @_ZW3mod3foov +// CHECK-OPT: define available_externally{{.*}} i32 @_ZW3mod3barv