https://github.com/mmha updated https://github.com/llvm/llvm-project/pull/151069
>From a636f04d087eb18e10e6ec738244e2e394deb60b Mon Sep 17 00:00:00 2001
From: Morris Hafner <mhaf...@nvidia.com>
Date: Tue, 29 Jul 2025 03:11:11 +0200
Subject: [PATCH 1/2] [CIR] Upstream support for variable template
specializations
---
clang/lib/CIR/CodeGen/CIRGenModule.cpp | 3 +-
.../variable-template-specialization.cpp | 32 +++++++++++++++++++
2 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 clang/test/CIR/CodeGen/variable-template-specialization.cpp
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 350270518156e..21a3a60472546 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -1244,7 +1244,8 @@ void CIRGenModule::emitTopLevelDecl(Decl *decl) {
break;
}
- case Decl::Var: {
+ case Decl::Var:
+ case Decl::VarTemplateSpecialization: {
auto *vd = cast<VarDecl>(decl);
emitGlobal(vd);
break;
diff --git a/clang/test/CIR/CodeGen/variable-template-specialization.cpp
b/clang/test/CIR/CodeGen/variable-template-specialization.cpp
new file mode 100644
index 0000000000000..f5043779a21f7
--- /dev/null
+++ b/clang/test/CIR/CodeGen/variable-template-specialization.cpp
@@ -0,0 +1,32 @@
+// RUN: %clang_cc1 -std=c++14 -triple nvptx64-unknown-unknown -fclangir
-emit-cir %s -o %t.cir
+// RUN: FileCheck --check-prefix=CIR --input-file=%t.cir %s
+// RUN: %clang_cc1 -std=c++14 -triple nvptx64-unknown-unknown -fclangir
-emit-llvm %s -o %t-cir.ll
+// RUN: FileCheck --check-prefix=LLVM --input-file=%t-cir.ll %s
+// RUN: %clang_cc1 -std=c++14 -triple nvptx64-unknown-unknown -emit-llvm %s -o
%t.ll
+// RUN: FileCheck --check-prefix=OGCG --input-file=%t.ll %s
+
+struct some_struct {
+ int x;
+};
+
+template<int I>
+int var_template;
+
+template<> int var_template<0>;
+template<> int var_template<1> = 1;
+template<> some_struct var_template<2>;
+
+// CIR: !rec_some_struct = !cir.record<struct "some_struct" {!s32i}>
+// CIR: cir.global external @_Z12var_templateILi0EE = #cir.int<0> : !s32i
+// CIR: cir.global external @_Z12var_templateILi1EE = #cir.int<1> : !s32i
+// CIR: cir.global external @_Z12var_templateILi2EE = #cir.zero :
!rec_some_struct
+
+// LLVM: %[[STRUCT_TYPE:.+]] = type { i32 }
+// LLVM: @_Z12var_templateILi0EE = global i32 0
+// LLVM: @_Z12var_templateILi1EE = global i32 1
+// LLVM: @_Z12var_templateILi2EE = global %[[STRUCT_TYPE]] zeroinitializer
+
+// OGCG: %[[STRUCT_TYPE:.+]] = type { i32 }
+// OGCG: @_Z12var_templateILi0EE = global i32 0
+// OGCG: @_Z12var_templateILi1EE = global i32 1
+// OGCG: @_Z12var_templateILi2EE = global %[[STRUCT_TYPE]] zeroinitializer
>From 039202731558a0e65c2914392e7871be7aadaa4a Mon Sep 17 00:00:00 2001
From: Morris Hafner <mhaf...@nvidia.com>
Date: Tue, 29 Jul 2025 04:28:57 +0200
Subject: [PATCH 2/2] Add support for partial specializations
---
clang/lib/CIR/CodeGen/CIRGenModule.cpp | 4 +++-
.../test/CIR/CodeGen/variable-template-specialization.cpp | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
index 21a3a60472546..fc533b6a9162c 100644
--- a/clang/lib/CIR/CodeGen/CIRGenModule.cpp
+++ b/clang/lib/CIR/CodeGen/CIRGenModule.cpp
@@ -1268,8 +1268,10 @@ void CIRGenModule::emitTopLevelDecl(Decl *decl) {
break;
// No code generation needed.
- case Decl::UsingShadow:
case Decl::Empty:
+ case Decl::UsingShadow:
+ case Decl::VarTemplate:
+ case Decl::VarTemplatePartialSpecialization:
break;
case Decl::CXXConstructor:
diff --git a/clang/test/CIR/CodeGen/variable-template-specialization.cpp
b/clang/test/CIR/CodeGen/variable-template-specialization.cpp
index f5043779a21f7..c13ab51ec64c9 100644
--- a/clang/test/CIR/CodeGen/variable-template-specialization.cpp
+++ b/clang/test/CIR/CodeGen/variable-template-specialization.cpp
@@ -30,3 +30,11 @@ template<> some_struct var_template<2>;
// OGCG: @_Z12var_templateILi0EE = global i32 0
// OGCG: @_Z12var_templateILi1EE = global i32 1
// OGCG: @_Z12var_templateILi2EE = global %[[STRUCT_TYPE]] zeroinitializer
+
+template<typename T, int I> int
partial_var_template_specialization_shouldnt_hit_codegen;
+template<typename T> int
partial_var_template_specialization_shouldnt_hit_codegen<T, 123>;
+template<int I> float
partial_var_template_specialization_shouldnt_hit_codegen<float, I>;
+
+// CIR-NOT: partial_var_template_specialization_shouldnt_hit_codegen
+// LLVM-NOT: partial_var_template_specialization_shouldnt_hit_codegen
+// OGCG-NOT: partial_var_template_specialization_shouldnt_hit_codegen
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
