summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseDeclCXX.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-04-21 18:42:51 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-04-21 18:42:51 +0000
commit84973e56e3094d4b93d0f1eab9e251c239d6455c (patch)
treeb523e1b1f35717b3a8afcee8aa5f35383ea1fc35 /clang/lib/Parse/ParseDeclCXX.cpp
parent2568bf3089a5dd91bc6ae47934681d70c5e5c0f0 (diff)
downloadbcm5719-llvm-84973e56e3094d4b93d0f1eab9e251c239d6455c.tar.gz
bcm5719-llvm-84973e56e3094d4b93d0f1eab9e251c239d6455c.zip
Fix regression in r154844. If necessary, defer computing adjusted destructor
exception specifications in C++11 until after we've parsed the exception specifications for nested classes. llvm-svn: 155293
Diffstat (limited to 'clang/lib/Parse/ParseDeclCXX.cpp')
-rw-r--r--clang/lib/Parse/ParseDeclCXX.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index b9b51d75182..c391782dca2 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -2369,6 +2369,10 @@ void Parser::ParseCXXMemberSpecification(SourceLocation RecordLoc,
SourceLocation SavedPrevTokLocation = PrevTokLocation;
ParseLexedAttributes(getCurrentClass());
ParseLexedMethodDeclarations(getCurrentClass());
+
+ // We've finished with all pending member declarations.
+ Actions.ActOnFinishCXXMemberDecls();
+
ParseLexedMemberInitializers(getCurrentClass());
ParseLexedMethodDefs(getCurrentClass());
PrevTokLocation = SavedPrevTokLocation;
OpenPOWER on IntegriCloud