commit f70a906a11d68f716a7337341b4dddb418081a3f
author Richard Smith <richard-llvm@metafoo.co.uk> Thu Oct 20 18:29:25 2016 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Thu Oct 20 18:29:25 2016 +0000
tree 1ae83b4abab111a4213192cae7b9f8df5f022761
parent 521e5ef4ceb2f2cf67e44b2dc0442a6c9ca880fb

[c++1z] Fix assertion failure when using the wrong number of bindings for a
struct with unnamed bitfields.

llvm-svn: 284761

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index f86b793..c1938d5 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -1279,7 +1279,9 @@
                                                  DecompType.getQualifiers());
 
   auto DiagnoseBadNumberOfBindings = [&]() -> bool {
-    unsigned NumFields = std::distance(RD->field_begin(), RD->field_end());
+    unsigned NumFields =
+        std::count_if(RD->field_begin(), RD->field_end(),
+                      [](FieldDecl *FD) { return !FD->isUnnamedBitfield(); });
     assert(Bindings.size() != NumFields);
     S.Diag(Src->getLocation(), diag::err_decomp_decl_wrong_number_bindings)
         << DecompType << (unsigned)Bindings.size() << NumFields