hokein created this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
hokein edited the summary of this revision.
hokein edited the summary of this revision.
hokein added a reviewer: sammccall.
hokein retitled this revision from "[AST] Dont invalide VarDecl even the
default initializaiton is failed." to "[AST] Dont invalidate VarDecl even the
default initializaiton is failed.".
This patch would cause clang emit more diagnostics, but it is much better than
https://reviews.llvm.org/D76831
cpp
struct A {
A(int);
~A() = delete;
};
void k() {
A a;
}
before the patch:
/tmp/t3.cpp:24:5: error: no matching constructor for initialization of 'A'
A a;
^
/tmp/t3.cpp:20:3: note: candidate constructor not viable: requires 1
argument, but 0 were provided
A(int);
^
/tmp/t3.cpp:19:8: note: candidate constructor (the implicit copy constructor)
not viable: requires 1 argument, but 0 were provided
struct A {
After the patch:
/tmp/t3.cpp:24:5: error: no matching constructor for initialization of 'A'
A a;
^
/tmp/t3.cpp:20:3: note: candidate constructor not viable: requires 1
argument, but 0 were provided
A(int);
^
/tmp/t3.cpp:19:8: note: candidate constructor (the implicit copy constructor)
not viable: requires 1 argument, but 0 were provided
struct A {
^
/tmp/t3.cpp:24:5: error: attempt to use a deleted function
A a;
^
/tmp/t3.cpp:21:3: note: '~A' has been explicitly marked deleted here
~A() = delete;
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D77395
Files:
clang/lib/Sema/SemaDecl.cpp
clang/test/AST/ast-dump-invalid-initialized.cpp
clang/test/CXX/class.access/p4.cpp
clang/test/CXX/drs/dr3xx.cpp
clang/test/CXX/special/class.ctor/p5-0x.cpp
clang/test/CodeCompletion/invalid-initialized-class.cpp
clang/test/SemaCXX/cxx0x-deleted-default-ctor.cpp
clang/test/SemaObjCXX/arc-0x.mm
Index: clang/test/SemaObjCXX/arc-0x.mm
===================================================================
--- clang/test/SemaObjCXX/arc-0x.mm
+++ clang/test/SemaObjCXX/arc-0x.mm
@@ -116,13 +116,13 @@
// Implicitly-declared special functions of a union are deleted by default if
// ARC is enabled and the union has an ObjC pointer field.
union U0 {
- id f0; // expected-note 6 {{'U0' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
+ id f0; // expected-note 7 {{'U0' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
};
union U1 {
- __weak id f0; // expected-note 12 {{'U1' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
+ __weak id f0; // expected-note 13 {{'U1' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
U1() = default; // expected-warning {{explicitly defaulted default constructor is implicitly deleted}} expected-note {{explicitly defaulted function was implicitly deleted here}}
- ~U1() = default; // expected-warning {{explicitly defaulted destructor is implicitly deleted}} expected-note {{explicitly defaulted function was implicitly deleted here}}
+ ~U1() = default; // expected-warning {{explicitly defaulted destructor is implicitly deleted}} expected-note 2{{explicitly defaulted function was implicitly deleted here}}
U1(const U1 &) = default; // expected-warning {{explicitly defaulted copy constructor is implicitly deleted}} expected-note 2 {{explicitly defaulted function was implicitly deleted here}}
U1(U1 &&) = default; // expected-warning {{explicitly defaulted move constructor is implicitly deleted}}
U1 & operator=(const U1 &) = default; // expected-warning {{explicitly defaulted copy assignment operator is implicitly deleted}} expected-note 2 {{explicitly defaulted function was implicitly deleted here}}
@@ -154,15 +154,15 @@
// functions of the containing class.
struct S0 {
union {
- id f0; // expected-note 6 {{'' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
+ id f0; // expected-note 7 {{'' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
char f1;
};
};
struct S1 {
union {
- union { // expected-note 2 {{'S1' is implicitly deleted because variant field '' has a non-trivial}} expected-note 4 {{'S1' is implicitly deleted because field '' has a deleted}}
- id f0; // expected-note 2 {{'' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
+ union { // expected-note 2 {{'S1' is implicitly deleted because variant field '' has a non-trivial}} expected-note 5 {{'S1' is implicitly deleted because field '' has a deleted}}
+ id f0; // expected-note 3 {{'' is implicitly deleted because variant field 'f0' is an ObjC pointer}}
char f1;
};
int f2;
@@ -172,7 +172,7 @@
struct S2 {
union {
// FIXME: the note should say 'f0' is causing the special functions to be deleted.
- struct { // expected-note 6 {{'S2' is implicitly deleted because variant field '' has a non-trivial}}
+ struct { // expected-note 7 {{'S2' is implicitly deleted because variant field '' has a non-trivial}}
id f0;
int f1;
};
@@ -189,14 +189,18 @@
S1 *x5;
S2 *x6;
- static union { // expected-error {{call to implicitly-deleted default constructor of}}
- id g0; // expected-note {{default constructor of '' is implicitly deleted because variant field 'g0' is an ObjC pointer}}
+ static union { // expected-error {{call to implicitly-deleted default constructor of}} expected-error {{attempt to use a deleted function}}
+ id g0; // expected-note {{default constructor of '' is implicitly deleted because variant field 'g0' is an ObjC pointer}} \
+ // expected-note {{destructor of '' is implicitly deleted because}}
};
- static union { // expected-error {{call to implicitly-deleted default constructor of}}
- union { // expected-note {{default constructor of '' is implicitly deleted because field '' has a deleted default constructor}}
- union { // expected-note {{default constructor of '' is implicitly deleted because field '' has a deleted default constructor}}
- __weak id g1; // expected-note {{default constructor of '' is implicitly deleted because variant field 'g1' is an ObjC pointer}}
+ static union { // expected-error {{call to implicitly-deleted default constructor of}} expected-error {{attempt to use a deleted function}}
+ union { // expected-note {{default constructor of '' is implicitly deleted because field '' has a deleted default constructor}} \
+ // expected-note {{destructor of '' is implicitly deleted because}}
+ union { // expected-note {{default constructor of '' is implicitly deleted because field '' has a deleted default constructor}} \
+ // expected-note {{destructor of '' is implicitly deleted because}}
+ __weak id g1; // expected-note {{default constructor of '' is implicitly deleted because variant field 'g1' is an ObjC pointer}} \
+ // expected-note {{destructor of '' is implicitly deleted because}}
int g2;
};
int g3;
@@ -205,13 +209,13 @@
};
void testDefaultConstructor() {
- U0 t0; // expected-error {{call to implicitly-deleted default constructor}}
- U1 t1; // expected-error {{call to implicitly-deleted default constructor}}
+ U0 t0; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+ U1 t1; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
U2 t2;
U3 t3;
- S0 t4; // expected-error {{call to implicitly-deleted default constructor}}
- S1 t5; // expected-error {{call to implicitly-deleted default constructor}}
- S2 t6; // expected-error {{call to implicitly-deleted default constructor}}
+ S0 t4; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+ S1 t5; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+ S2 t6; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
}
void testDestructor(U0 *u0, U1 *u1, U2 *u2, U3 *u3, S0 *s0, S1 *s1, S2 *s2) {
Index: clang/test/SemaCXX/cxx0x-deleted-default-ctor.cpp
===================================================================
--- clang/test/SemaCXX/cxx0x-deleted-default-ctor.cpp
+++ clang/test/SemaCXX/cxx0x-deleted-default-ctor.cpp
@@ -8,9 +8,9 @@
};
union bad_union {
- non_trivial nt; // expected-note {{non-trivial default constructor}}
+ non_trivial nt; // expected-note {{non-trivial default constructor}} // expected-note {{destructor of 'bad_union' is implicitly deleted}}
};
-bad_union u; // expected-error {{call to implicitly-deleted default constructor}}
+bad_union u; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
union bad_union2 { // expected-note {{all data members are const-qualified}}
const int i;
};
@@ -18,10 +18,10 @@
struct bad_anon {
union {
- non_trivial nt; // expected-note {{non-trivial default constructor}}
+ non_trivial nt; // expected-note {{non-trivial default constructor}} expected-note {{destructor of 'bad_anon' is implicitly deleted}}
};
};
-bad_anon a; // expected-error {{call to implicitly-deleted default constructor}}
+bad_anon a; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
struct bad_anon2 {
union { // expected-note {{all data members of an anonymous union member are const-qualified}}
const int i;
@@ -62,7 +62,7 @@
no_default() = delete; // expected-note 5{{deleted here}}
};
struct no_dtor {
- ~no_dtor() = delete; // expected-note 2{{deleted here}}
+ ~no_dtor() = delete; // expected-note 4{{deleted here}}
};
struct bad_field_default {
@@ -74,12 +74,12 @@
bad_base_default bbd; // expected-error {{call to implicitly-deleted default constructor}}
struct bad_field_dtor {
- no_dtor nd; // expected-note {{field 'nd' has a deleted destructor}}
+ no_dtor nd; // expected-note {{field 'nd' has a deleted destructor}} expected-note {{destructor of 'bad_field_dtor' is implicitly deleted }}
};
-bad_field_dtor bfx; // expected-error {{call to implicitly-deleted default constructor}}
-struct bad_base_dtor : no_dtor { // expected-note {{base class 'no_dtor' has a deleted destructor}}
+bad_field_dtor bfx; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+struct bad_base_dtor : no_dtor { // expected-note {{base class 'no_dtor' has a deleted destructor}} expected-note {{destructor of 'bad_base_dtor' is implicitly deleted}}
};
-bad_base_dtor bbx; // expected-error {{call to implicitly-deleted default constructor}}
+bad_base_dtor bbx; // expected-error {{call to implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
struct ambiguous_default {
ambiguous_default();
Index: clang/test/CodeCompletion/invalid-initialized-class.cpp
===================================================================
--- /dev/null
+++ clang/test/CodeCompletion/invalid-initialized-class.cpp
@@ -0,0 +1,7 @@
+struct Foo { Foo(int); int abc; };
+void invalidDeclRefExpr() {
+ Foo foo;
+ foo.;
+ // RUN: not %clang_cc1 -fsyntax-only -code-completion-at=%s:4:7 %s -o - | FileCheck %s
+ // CHECK: COMPLETION: abc
+}
\ No newline at end of file
Index: clang/test/CXX/special/class.ctor/p5-0x.cpp
===================================================================
--- clang/test/CXX/special/class.ctor/p5-0x.cpp
+++ clang/test/CXX/special/class.ctor/p5-0x.cpp
@@ -4,7 +4,7 @@
struct DefaultedDefCtor2 { DefaultedDefCtor2() = default; };
struct DeletedDefCtor { DeletedDefCtor() = delete; DeletedDefCtor(int); }; // expected-note {{explicitly marked deleted here}}
class PrivateDefCtor { PrivateDefCtor() = default; public: PrivateDefCtor(int); };
-struct DeletedDtor { ~DeletedDtor() = delete; }; // expected-note 4{{explicitly marked deleted here}}
+struct DeletedDtor { ~DeletedDtor() = delete; }; // expected-note 8{{explicitly marked deleted here}}
class PrivateDtor { ~PrivateDtor() = default; };
class Friend {
Friend() = default; ~Friend() = default;
@@ -122,22 +122,22 @@
// - any direct or virtual base class or non-static data member has a type with
// a destructor that is deleted or inaccessible from the defaulted default
// constructor.
-struct Deleted7a : DeletedDtor {}; // expected-note {{because base class 'DeletedDtor' has a deleted destructor}}
-Deleted7a d7a; // expected-error {{implicitly-deleted default constructor}}
-struct Deleted7b : virtual DeletedDtor {}; // expected-note {{because base class 'DeletedDtor' has a deleted destructor}}
-Deleted7b d7b; // expected-error {{implicitly-deleted default constructor}}
-struct Deleted7c { DeletedDtor a; }; // expected-note {{because field 'a' has a deleted destructor}}
-Deleted7c d7c; // expected-error {{implicitly-deleted default constructor}}
-struct Deleted7d { DeletedDtor a = {}; }; // expected-note {{because field 'a' has a deleted destructor}}
-Deleted7d d7d; // expected-error {{implicitly-deleted default constructor}}
-struct Deleted7e : PrivateDtor {}; // expected-note {{base class 'PrivateDtor' has an inaccessible destructor}}
-Deleted7e d7e; // expected-error {{implicitly-deleted default constructor}}
-struct Deleted7f : virtual PrivateDtor {}; // expected-note {{base class 'PrivateDtor' has an inaccessible destructor}}
-Deleted7f d7f; // expected-error {{implicitly-deleted default constructor}}
-struct Deleted7g { PrivateDtor a; }; // expected-note {{field 'a' has an inaccessible destructor}}
-Deleted7g d7g; // expected-error {{implicitly-deleted default constructor}}
-struct Deleted7h { PrivateDtor a = {}; }; // expected-note {{field 'a' has an inaccessible destructor}}
-Deleted7h d7h; // expected-error {{implicitly-deleted default constructor}}
+struct Deleted7a : DeletedDtor {}; // expected-note 2{{because base class 'DeletedDtor' has a deleted destructor}}
+Deleted7a d7a; // expected-error {{implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+struct Deleted7b : virtual DeletedDtor {}; // expected-note 2{{because base class 'DeletedDtor' has a deleted destructor}}
+Deleted7b d7b; // expected-error {{implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+struct Deleted7c { DeletedDtor a; }; // expected-note 2{{because field 'a' has a deleted destructor}}
+Deleted7c d7c; // expected-error {{implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+struct Deleted7d { DeletedDtor a = {}; }; // expected-note 2{{because field 'a' has a deleted destructor}}
+Deleted7d d7d; // expected-error {{implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+struct Deleted7e : PrivateDtor {}; // expected-note 2{{base class 'PrivateDtor' has an inaccessible destructor}}
+Deleted7e d7e; // expected-error {{implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+struct Deleted7f : virtual PrivateDtor {}; // expected-note 2{{base class 'PrivateDtor' has an inaccessible destructor}}
+Deleted7f d7f; // expected-error {{implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+struct Deleted7g { PrivateDtor a; }; // expected-note 2{{field 'a' has an inaccessible destructor}}
+Deleted7g d7g; // expected-error {{implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
+struct Deleted7h { PrivateDtor a = {}; }; // expected-note 2{{field 'a' has an inaccessible destructor}}
+Deleted7h d7h; // expected-error {{implicitly-deleted default constructor}} expected-error {{attempt to use a deleted function}}
struct NotDeleted7i : Friend {};
NotDeleted7i d7i;
struct NotDeleted7j : virtual Friend {};
Index: clang/test/CXX/drs/dr3xx.cpp
===================================================================
--- clang/test/CXX/drs/dr3xx.cpp
+++ clang/test/CXX/drs/dr3xx.cpp
@@ -429,8 +429,8 @@
namespace dr331 { // dr331: yes
struct A {
- A(volatile A&); // expected-note {{candidate}}
- } const a, b(a); // expected-error {{no matching constructor}}
+ A(volatile A&); // expected-note 2{{candidate}}
+ } const a, b(a); // expected-error 2{{no matching constructor}}
}
namespace dr332 { // dr332: dup 577
Index: clang/test/CXX/class.access/p4.cpp
===================================================================
--- clang/test/CXX/class.access/p4.cpp
+++ clang/test/CXX/class.access/p4.cpp
@@ -189,12 +189,12 @@
};
class Derived3 :
- Base<0>, // expected-note {{deleted because base class 'Base<0>' has an inaccessible destructor}}
+ Base<0>, // expected-note 2{{deleted because base class 'Base<0>' has an inaccessible destructor}}
virtual Base<1>,
Base2,
virtual Base3
{};
- Derived3 d3; // expected-error {{implicitly-deleted default constructor}}
+ Derived3 d3; // expected-error {{implicitly-deleted default constructor}} // expected-error {{attempt to use a deleted function}}
#endif
}
Index: clang/test/AST/ast-dump-invalid-initialized.cpp
===================================================================
--- /dev/null
+++ clang/test/AST/ast-dump-invalid-initialized.cpp
@@ -0,0 +1,17 @@
+// RUN: not %clang_cc1 -triple x86_64-unknown-unknown -Wno-unused-value -fcxx-exceptions -std=gnu++17 -ast-dump %s | FileCheck -strict-whitespace %s
+
+struct A { A(int, int) {} };
+class ForwardDecl;
+
+void test() {
+ // CHECK: `-VarDecl {{.*}} a1 'A'
+ A a1;
+ // CHECK: `-VarDecl {{.*}} a2 'const A'
+ const A a2;
+
+
+ // CHECK: `-VarDecl {{.*}} invalid a3 'const A &'
+ const A& a3;
+ // CHECK: `-VarDecl {{.*}} invalid b 'ForwardDecl'
+ ForwardDecl b;
+}
\ No newline at end of file
Index: clang/lib/Sema/SemaDecl.cpp
===================================================================
--- clang/lib/Sema/SemaDecl.cpp
+++ clang/lib/Sema/SemaDecl.cpp
@@ -12553,9 +12553,12 @@
InitializationSequence InitSeq(*this, Entity, Kind, None);
ExprResult Init = InitSeq.Perform(*this, Entity, Kind, None);
- if (Init.isInvalid())
- Var->setInvalidDecl();
- else if (Init.get()) {
+
+ // Don't invalidate VarDecl when the default initialization is failed, so
+ // that we would preserve more AST nodes (DeclRefExpr could be built rather
+ // than dropped) in broken code.
+
+ if (Init.get()) {
Var->setInit(MaybeCreateExprWithCleanups(Init.get()));
// This is important for template substitution.
Var->setInitStyle(VarDecl::CallInit);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
