[clang] [Clang] Mark declarators invalid in the presence of ill-formed explicit parameters. (PR #70018)
via cfe-commits
cfe-commits at lists.llvm.org
Tue Oct 24 02:24:52 PDT 2023
https://github.com/cor3ntin created https://github.com/llvm/llvm-project/pull/70018
To avoid crashes later in sema.
Fixes #69962
Fixes #69838
>From 4810d5c8d9d9ec95300c3b684fe3ff88fdd05351 Mon Sep 17 00:00:00 2001
From: Corentin Jabot <corentinjabot at gmail.com>
Date: Tue, 24 Oct 2023 11:20:30 +0200
Subject: [PATCH] [Clang] Mark declarators invalid in the presence of
ill-formed explicit parameters.
To avoid crashes later in sema.
Fixes #69962
Fixes #69838
---
clang/lib/Sema/SemaDeclCXX.cpp | 7 +++-
clang/test/SemaCXX/cxx2b-deducing-this.cpp | 43 ++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 0193e476b3a781b..898758502e51bde 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -11352,12 +11352,14 @@ void Sema::CheckExplicitObjectMemberFunction(Declarator &D,
Diag(ExplicitObjectParam->getBeginLoc(),
diag::err_explicit_object_parameter_nonmember)
<< D.getSourceRange() << /*static=*/0 << IsLambda;
+ D.setInvalidType();
}
if (D.getDeclSpec().isVirtualSpecified()) {
Diag(ExplicitObjectParam->getBeginLoc(),
diag::err_explicit_object_parameter_nonmember)
<< D.getSourceRange() << /*virtual=*/1 << IsLambda;
+ D.setInvalidType();
}
if (IsLambda && FTI.hasMutableQualifier()) {
@@ -11373,16 +11375,19 @@ void Sema::CheckExplicitObjectMemberFunction(Declarator &D,
Diag(ExplicitObjectParam->getLocation(),
diag::err_explicit_object_parameter_nonmember)
<< D.getSourceRange() << /*non-member=*/2 << IsLambda;
+ D.setInvalidType();
return;
}
// CWG2674: constructors and destructors cannot have explicit parameters.
if (Name.getNameKind() == DeclarationName::CXXConstructorName ||
- Name.getNameKind() == DeclarationName::CXXDestructorName)
+ Name.getNameKind() == DeclarationName::CXXDestructorName) {
Diag(ExplicitObjectParam->getBeginLoc(),
diag::err_explicit_object_parameter_constructor)
<< (Name.getNameKind() == DeclarationName::CXXDestructorName)
<< D.getSourceRange();
+ D.setInvalidType();
+ }
}
namespace {
diff --git a/clang/test/SemaCXX/cxx2b-deducing-this.cpp b/clang/test/SemaCXX/cxx2b-deducing-this.cpp
index cb83270752443ad..535381e876da9c7 100644
--- a/clang/test/SemaCXX/cxx2b-deducing-this.cpp
+++ b/clang/test/SemaCXX/cxx2b-deducing-this.cpp
@@ -542,3 +542,46 @@ void foo(C c) {
}
}
+
+
+namespace GH69838 {
+struct S {
+ S(this auto &self) {} // expected-error {{an explicit object parameter cannot appear in a constructor}}
+ virtual void f(this S self) {} // expected-error {{an explicit object parameter cannot appear in a virtual function}}
+ void g(this auto &self) const {} // expected-error {{explicit object member function cannot have 'const' qualifier}}
+ void h(this S self = S{}) {} // expected-error {{the explicit object parameter cannot have a default argument}}
+ void i(int i, this S self = S{}) {} // expected-error {{an explicit object parameter can only appear as the first parameter of the function}}
+ ~S(this S &&self); // expected-error {{an explicit object parameter cannot appear in a destructor}} \
+ // expected-error {{destructor cannot have any parameters}}
+
+ static void j(this S s); // expected-error {{an explicit object parameter cannot appear in a static function}}
+};
+
+void nonmember(this S s); // expected-error {{an explicit object parameter cannot appear in a non-member function}}
+
+int test() {
+ S s;
+ s.f();
+ s.g();
+ s.h();
+ s.i(0);
+ s.j({});
+ nonmember(S{});
+}
+
+}
+
+namespace GH69962 {
+struct S {
+ S(const S&);
+};
+
+struct Thing {
+ template<typename Self, typename ... Args>
+ Thing(this Self&& self, Args&& ... args) { } // expected-error {{an explicit object parameter cannot appear in a constructor}}
+};
+
+class Server : public Thing {
+ S name_;
+};
+}
More information about the cfe-commits
mailing list