commit a4156b8574666aa69a2b0ad35dc9e9603433e4ae
author Richard Smith <richard-llvm@metafoo.co.uk> Sat Apr 21 18:42:51 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Sat Apr 21 18:42:51 2012 +0000
tree fb5fc19b6bc87ff046706add9572d6963d225a89
parent 94d55d7ecdd693788a8f3910a0da1b5ecdaa8a86

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.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@155293 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/ParseDeclCXX.cpp

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index b9b51d7..c391782 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -2369,6 +2369,10 @@
     SourceLocation SavedPrevTokLocation = PrevTokLocation;
     ParseLexedAttributes(getCurrentClass());
     ParseLexedMethodDeclarations(getCurrentClass());
+
+    // We've finished with all pending member declarations.
+    Actions.ActOnFinishCXXMemberDecls();
+
     ParseLexedMemberInitializers(getCurrentClass());
     ParseLexedMethodDefs(getCurrentClass());
     PrevTokLocation = SavedPrevTokLocation;