https://github.com/Megan0704-1 updated
https://github.com/llvm/llvm-project/pull/131100
>From d71f03f02bb97d12dfd5b02516418d802e588a8c Mon Sep 17 00:00:00 2001
From: Megan <megan...@asu.edu>
Date: Tue, 11 Mar 2025 17:09:04 -0700
Subject: [PATCH 1/3] [Sema] Diagnose by-value copy constructors in template
instantiations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fixes #80963
Previously, Clang skipped diagnosing a constructor if it was implicitly
instantiated from a template class (TSK_ImplicitInstantiation). This allowed
ill-formed “copy” constructors taking the class by value (e.g. A(A)) to slip
through without a diagnostic.
However, the C++ standard mandates that copy constructors must take their
class type parameter by reference (e.g., A(const A&)). Furthermore, a
constructor template that *would* form a copy-by-value signature is not
treated as a copy constructor and should never be chosen for copying.
This patch replaces the check on TSK_ImplicitInstantiation with a check
to see if the constructor is a function template specialization (i.e.,
isFunctionTemplateSpecialization()). That ensures proper diagnosis of
non-template copy-by-value constructors, while still allowing valid
template constructors that might appear to have a copy-like signature
but should be SFINAEd out or simply not selected as a copy constructor.
---
clang/test/SemaCXX/copy-ctor-template.cpp | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/clang/test/SemaCXX/copy-ctor-template.cpp
b/clang/test/SemaCXX/copy-ctor-template.cpp
index c58bd7c0c5e10..a46a167038cf7 100644
--- a/clang/test/SemaCXX/copy-ctor-template.cpp
+++ b/clang/test/SemaCXX/copy-ctor-template.cpp
@@ -2,20 +2,13 @@
template<class T, class V>
struct A{
- A(); // expected-note{{candidate constructor not viable: requires 0
arguments, but 1 was provided}}
- A(A&); // expected-note{{candidate constructor not viable: expects an
lvalue for 1st argument}}
+ A();
+ A(A&);
A(A<V, T>); // expected-error{{copy constructor must pass its first
argument by reference}}
};
void f() {
- A<int, int> a = A<int, int>(); // expected-note{{in instantiation of
template class 'A<int, int>'}}
- A<int, double> a1 = A<double, int>(); // No error (not a copy constructor)
-}
-
-// Test rvalue-to-lvalue conversion in copy constructor
-A<int, int> &&a(void);
-void g() {
- A<int, int> a2 = a(); // expected-error{{no matching constructor}}
+ A<int, int> a = A<int, int>(); // expected-note{{in instantiation of
template class 'A<int, int>'}}
}
template<class T, class V>
@@ -24,6 +17,6 @@ struct B{
template<class U> B(U); // No error (templated constructor)
};
-void h() {
+void g() {
B<int, int> b = B<int, int>(); // should use implicit copy constructor
}
>From d86b276864584d46a133b1fab55c561e6da11286 Mon Sep 17 00:00:00 2001
From: Megan <megan...@asu.edu>
Date: Wed, 12 Mar 2025 01:24:35 -0700
Subject: [PATCH 2/3] [Sema] Fix test diagnostics for copy-ctor-template
---
clang/test/SemaCXX/copy-ctor-template.cpp | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/clang/test/SemaCXX/copy-ctor-template.cpp
b/clang/test/SemaCXX/copy-ctor-template.cpp
index a46a167038cf7..c58bd7c0c5e10 100644
--- a/clang/test/SemaCXX/copy-ctor-template.cpp
+++ b/clang/test/SemaCXX/copy-ctor-template.cpp
@@ -2,13 +2,20 @@
template<class T, class V>
struct A{
- A();
- A(A&);
+ A(); // expected-note{{candidate constructor not viable: requires 0
arguments, but 1 was provided}}
+ A(A&); // expected-note{{candidate constructor not viable: expects an
lvalue for 1st argument}}
A(A<V, T>); // expected-error{{copy constructor must pass its first
argument by reference}}
};
void f() {
- A<int, int> a = A<int, int>(); // expected-note{{in instantiation of
template class 'A<int, int>'}}
+ A<int, int> a = A<int, int>(); // expected-note{{in instantiation of
template class 'A<int, int>'}}
+ A<int, double> a1 = A<double, int>(); // No error (not a copy constructor)
+}
+
+// Test rvalue-to-lvalue conversion in copy constructor
+A<int, int> &&a(void);
+void g() {
+ A<int, int> a2 = a(); // expected-error{{no matching constructor}}
}
template<class T, class V>
@@ -17,6 +24,6 @@ struct B{
template<class U> B(U); // No error (templated constructor)
};
-void g() {
+void h() {
B<int, int> b = B<int, int>(); // should use implicit copy constructor
}
>From a8d4f18e0bbcb2b0c6c889f656221536051c2cfa Mon Sep 17 00:00:00 2001
From: Megan <megan...@asu.edu>
Date: Thu, 13 Mar 2025 01:24:01 -0700
Subject: [PATCH 3/3] [NFC] Run clang-format on constructor-template.cpp
---
clang/lib/Sema/SemaDeclCXX.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index dd779ee377309..673f7eafca7fb 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -10938,8 +10938,7 @@ void Sema::CheckConstructor(CXXConstructorDecl
*Constructor) {
// parameters have default arguments.
if (!Constructor->isInvalidDecl() &&
Constructor->hasOneParamOrDefaultArgs() &&
- !Constructor->isFunctionTemplateSpecialization()
- ) {
+ !Constructor->isFunctionTemplateSpecialization()) {
QualType ParamType = Constructor->getParamDecl(0)->getType();
QualType ClassTy = Context.getTagDeclType(ClassDecl);
if (Context.getCanonicalType(ParamType).getUnqualifiedType() == ClassTy) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
