Diagnose unexpanded parameter packs in member initialisers (including

in-class member initialisers).

llvm-svn: 142758

1 files changed, 9 insertions, 0 deletions

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 4c7ebbd56ae..0be473ea9c9 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -1635,6 +1635,12 @@ Sema::ActOnCXXInClassMemberInitializer(Decl *D, SourceLocation EqualLoc,
     return;
   }
 
+  if (DiagnoseUnexpandedParameterPack(InitExpr, UPPC_Initializer)) {
+    FD->setInvalidDecl();
+    FD->removeInClassInitializer();
+    return;
+  }
+
   ExprResult Init = InitExpr;
   if (!FD->getType()->isDependentType() && !InitExpr->isTypeDependent()) {
     // FIXME: if there is no EqualLoc, this is list-initialization.
@@ -2031,6 +2037,9 @@ Sema::BuildMemberInitializer(ValueDecl *Member,
   assert((DirectMember || IndirectMember) &&
          "Member must be a FieldDecl or IndirectFieldDecl");
 
+  if (Args.DiagnoseUnexpandedParameterPack(*this))
+    return true;
+
   if (Member->isInvalidDecl())
     return true;