r204954 - Don't emit exit-time destructor warnings for trivial explicitly defaulted dtors
Stephan Tolksdorf
st at quanttec.com
Thu Mar 27 13:23:36 PDT 2014
Author: stephant
Date: Thu Mar 27 15:23:36 2014
New Revision: 204954
URL: http://llvm.org/viewvc/llvm-project?rev=204954&view=rev
Log:
Don't emit exit-time destructor warnings for trivial explicitly defaulted dtors
This commit also adds an additional test case for the global destructor warning.
Reviewed in http://llvm-reviews.chandlerc.com/D3205
Modified:
cfe/trunk/lib/Sema/SemaDeclCXX.cpp
cfe/trunk/test/SemaCXX/warn-exit-time-destructors.cpp
cfe/trunk/test/SemaCXX/warn-global-constructors.cpp
Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cpp?rev=204954&r1=204953&r2=204954&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Thu Mar 27 15:23:36 2014
@@ -10463,6 +10463,7 @@ void Sema::FinalizeVarWithDestructor(Var
<< VD->getType());
DiagnoseUseOfDecl(Destructor, VD->getLocation());
+ if (Destructor->isTrivial()) return;
if (!VD->hasGlobalStorage()) return;
// Emit warning for non-trivial dtor in global scope (a real global,
@@ -10470,7 +10471,7 @@ void Sema::FinalizeVarWithDestructor(Var
Diag(VD->getLocation(), diag::warn_exit_time_destructor);
// TODO: this should be re-enabled for static locals by !CXAAtExit
- if (!Destructor->isTrivial() && !VD->isStaticLocal())
+ if (!VD->isStaticLocal())
Diag(VD->getLocation(), diag::warn_global_destructor);
}
Modified: cfe/trunk/test/SemaCXX/warn-exit-time-destructors.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-exit-time-destructors.cpp?rev=204954&r1=204953&r2=204954&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-exit-time-destructors.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-exit-time-destructors.cpp Thu Mar 27 15:23:36 2014
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsyntax-only -Wexit-time-destructors %s -verify
+// RUN: %clang_cc1 -std=c++11 -fsyntax-only -Wexit-time-destructors %s -verify
namespace test1 {
struct A { ~A(); };
@@ -23,5 +23,23 @@ void f() {
static A &e = b[5];
static A &f = c[5][7];
}
+}
+
+namespace test3 {
+ struct A { ~A() = default; };
+ A a;
+
+ struct B { ~B(); };
+ struct C : B { ~C() = default; };
+ C c; // expected-warning {{exit-time destructor}}
+ class D {
+ friend struct E;
+ ~D() = default;
+ };
+ struct E : D {
+ D d;
+ ~E() = default;
+ };
+ E e;
}
Modified: cfe/trunk/test/SemaCXX/warn-global-constructors.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-global-constructors.cpp?rev=204954&r1=204953&r2=204954&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-global-constructors.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-global-constructors.cpp Thu Mar 27 15:23:36 2014
@@ -105,7 +105,18 @@ namespace referencemember {
namespace pr19253 {
struct A { ~A() = default; };
A a;
- struct B { ~B() {} };
+
+ struct B { ~B(); };
struct C : B { ~C() = default; };
C c; // expected-warning {{global destructor}}
+
+ class D {
+ friend struct E;
+ ~D() = default;
+ };
+ struct E : D {
+ D d;
+ ~E() = default;
+ };
+ E e;
}
More information about the cfe-commits
mailing list