[clang] 367e618 - [C++20] [Modules] Emit full specialization of variable template as available externally in importers

[Chuanqi Xu via cfe-commits]

Author: Chuanqi Xu
Date: 2023-01-03T14:48:29+08:00
New Revision: 367e618fd605353ad77bb78f884c758948f0d573

URL: https://github.com/llvm/llvm-project/commit/367e618fd605353ad77bb78f884c758948f0d573
DIFF: https://github.com/llvm/llvm-project/commit/367e618fd605353ad77bb78f884c758948f0d573.diff

LOG: [C++20] [Modules] Emit full specialization of variable template as available externally in importers

Closes https://github.com/llvm/llvm-project/issues/59780.

In this issue report, when we use full specialization of variable
templates in modules, we will meet the multiple definition errors.

The root cause of the problem is that when we see the full
specialization of the variable template in the importers, we will find
if it is already defined in the external sources and we failed to find
such definitions from external sources. So we generate the definition in
the current TU. We failed to find the definition in the external sources
because we restricted to not write it during writing. However, we don't
know why we restricted it and it doesn't make a lot sense to do such
restriction. Then no test fails after we remove such limitations. So
let's remove it now and add it back later if we found it is necessary
then we can add the corresponding test that time.

Note that the code is only applied to named modules and
PCHWithObjectFiles. So it won't affect the normal clang modules and
header units.

Added: 
    clang/test/Modules/pr59780.cppm

Modified: 
    clang/lib/Serialization/ASTWriterDecl.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/Serialization/ASTWriterDecl.cpp b/clang/lib/Serialization/ASTWriterDecl.cpp
index 353a58507cb2..c117a29723a7 100644
--- a/clang/lib/Serialization/ASTWriterDecl.cpp
+++ b/clang/lib/Serialization/ASTWriterDecl.cpp
@@ -1037,8 +1037,7 @@ void ASTDeclWriter::VisitVarDecl(VarDecl *D) {
   if (D->getStorageDuration() == SD_Static) {
     bool ModulesCodegen = false;
     if (Writer.WritingModule &&
-        !D->getDescribedVarTemplate() && !D->getMemberSpecializationInfo() &&
-        !isa<VarTemplateSpecializationDecl>(D)) {
+        !D->getDescribedVarTemplate() && !D->getMemberSpecializationInfo()) {
       // 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

diff  --git a/clang/test/Modules/pr59780.cppm b/clang/test/Modules/pr59780.cppm
new file mode 100644
index 000000000000..9578325b976b
--- /dev/null
+++ b/clang/test/Modules/pr59780.cppm
@@ -0,0 +1,46 @@
+// https://github.com/llvm/llvm-project/issues/59780
+//
+// RUN: rm -rf %t
+// RUN: mkdir %t
+// RUN: split-file %s %t
+//
+// RUN: %clang_cc1 -std=c++20 %t/a.cppm -triple %itanium_abi_triple -emit-module-interface -o %t/a.pcm
+// RUN: %clang_cc1 -std=c++20 %t/use.cpp -fprebuilt-module-path=%t -S \
+// RUN:     -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %t/use.cpp
+// RUN: %clang_cc1 -std=c++20 %t/a.pcm -triple %itanium_abi_triple -emit-llvm -o - | FileCheck %t/a.cppm
+
+//--- a.cppm
+export module a;
+
+export template<typename T>
+int x = 0;
+
+export template<>
+int x<int> = 0;
+
+export template<typename T>
+struct Y {
+    static int value;
+};
+
+template <typename T>
+int Y<T>::value = 0;
+
+export template<>
+struct Y<int> {
+    static int value;
+};
+
+int Y<int>::value = 0;
+
+// CHECK-NOT: @_ZW1a1xIiE = {{.*}}available_externally{{.*}}global
+// CHECK-NOT: @_ZNW1a1YIiE5valueE = {{.*}}available_externally{{.*}}global
+
+//--- use.cpp
+import a;
+int foo() {
+    return x<int> + Y<int>::value;
+}
+
+// CHECK: @_ZW1a1xIiE = {{.*}}available_externally{{.*}}global
+// CHECK: @_ZNW1a1YIiE5valueE = {{.*}}available_externally{{.*}}global