[c++17] If a class inherits virtual functions from a base class, it is
not an aggregtae.
llvm-svn: 334763
diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp
index b3607ca..076e637 100644
--- a/clang/lib/AST/DeclCXX.cpp
+++ b/clang/lib/AST/DeclCXX.cpp
@@ -259,9 +259,13 @@
// C++ [class.virtual]p1:
// A class that declares or inherits a virtual function is called a
// polymorphic class.
- if (BaseClassDecl->isPolymorphic())
+ if (BaseClassDecl->isPolymorphic()) {
data().Polymorphic = true;
+ // An aggregate is a class with [...] no virtual functions.
+ data().Aggregate = false;
+ }
+
// C++0x [class]p7:
// A standard-layout class is a class that: [...]
// -- has no non-standard-layout base classes
diff --git a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.aggr/p1.cpp b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.aggr/p1.cpp
index f4f73a5..e9e9ce5 100644
--- a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.aggr/p1.cpp
+++ b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.aggr/p1.cpp
@@ -111,6 +111,11 @@
};
NonAggr6 na6 = { 42 }; // expected-error {{no matching constructor for initialization of 'NonAggr6'}}
+struct NonAggr7 : NonAggr6 { // expected-note 3 {{candidate constructor}}
+ int n;
+};
+NonAggr7 na7 = {{}, 42}; // expected-error {{no matching constructor for initialization of 'NonAggr7'}}
+
struct DefaultedAggr {
int n;