[Clang] Mark declarators invalid in the presence of ill-formed explicit parameters. (#70018)

To avoid crashes later in sema.

Fixes #69962
Fixes #69838
This commit is contained in:
cor3ntin
2023-10-24 20:42:31 +02:00
committed by GitHub
parent 570c168e86
commit 20d97adfd3
3 changed files with 50 additions and 7 deletions

View File

@@ -11353,12 +11353,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()) {
@@ -11374,16 +11376,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 {

View File

@@ -85,8 +85,7 @@ using ::dr2521::operator""_div;
#if __cplusplus >= 202302L
namespace dr2553 { // dr2553: 18
struct B {
virtual void f(this B&); // expected-error {{an explicit object parameter cannot appear in a virtual function}} \
// expected-note {{here}}
virtual void f(this B&); // expected-error {{an explicit object parameter cannot appear in a virtual function}}
static void f(this B&); // expected-error {{an explicit object parameter cannot appear in a static function}}
virtual void g(); // expected-note {{here}}
};
@@ -94,10 +93,6 @@ struct D : B {
void g(this D&); // expected-error {{an explicit object parameter cannot appear in a virtual function}}
};
struct D2 : B {
void f(this B&); // expected-error {{an explicit object parameter cannot appear in a virtual function}}
};
}
#endif

View File

@@ -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_;
};
}