diff options
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 8 | ||||
| -rw-r--r-- | include/clang/Sema/Sema.h | 5 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 3 | ||||
| -rw-r--r-- | test/CXX/temp/temp.decls/temp.variadic/p5.cpp | 1 |
4 files changed, 12 insertions, 5 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 78a7a17eb5..7cdfab6200 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -1823,19 +1823,19 @@ def note_template_parameter_pack_here : Note< def err_unexpanded_parameter_pack_0 : Error< "%select{expression|base type|declaration type|data member type|bit-field " - "size}0 " + "size|static assertion}0 " "contains unexpanded parameter pack">; def err_unexpanded_parameter_pack_1 : Error< "%select{expression|base type|declaration type|data member type|bit-field " - "size}0 " + "size|static assertion}0 " "contains unexpanded parameter pack %1">; def err_unexpanded_parameter_pack_2 : Error< "%select{expression|base type|declaration type|data member type|bit-field " - "size}0 " + "size|static assertion}0 " "contains unexpanded parameter packs %1 and %2">; def err_unexpanded_parameter_pack_3_or_more : Error< "%select{expression|base type|declaration type|data member type|bit-field " - "size}0 " + "size|static assertion}0 " "contains unexpanded parameter packs %1, %2, ...">; def err_unexpected_typedef : Error< diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 2dc09d339c..07a7be298e 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -3148,7 +3148,10 @@ public: UPPC_DataMemberType, /// \brief The size of a bit-field. - UPPC_BitFieldWidth + UPPC_BitFieldWidth, + + /// \brief The expression in a static assertion. + UPPC_StaticAssertExpression }; /// \brief If the given type contains an unexpanded parameter pack, diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index d538715917..555f5fd424 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -6175,6 +6175,9 @@ Decl *Sema::ActOnStaticAssertDeclaration(SourceLocation AssertLoc, } } + if (DiagnoseUnexpandedParameterPack(AssertExpr, UPPC_StaticAssertExpression)) + return 0; + Decl *Decl = StaticAssertDecl::Create(Context, CurContext, AssertLoc, AssertExpr, AssertMessage); diff --git a/test/CXX/temp/temp.decls/temp.variadic/p5.cpp b/test/CXX/temp/temp.decls/temp.variadic/p5.cpp index 0e5c9c0979..52a619010d 100644 --- a/test/CXX/temp/temp.decls/temp.variadic/p5.cpp +++ b/test/CXX/temp/temp.decls/temp.variadic/p5.cpp @@ -111,6 +111,7 @@ struct TestUnexpandedDecls { Types data_member; // expected-error{{data member type contains unexpanded parameter pack 'Types'}} static Types static_data_member; // expected-error{{declaration type contains unexpanded parameter pack 'Types'}} unsigned bit_field : static_cast<Types>(0); // expected-error{{bit-field size contains unexpanded parameter pack 'Types'}} + static_assert(static_cast<Types>(0), "Boom"); // expected-error{{static assertion contains unexpanded parameter pack 'Types'}} }; // Test for diagnostics in the presence of multiple unexpanded |