Commit c5606e3e authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r155788: 

------------------------------------------------------------------------
r155788 | rsmith | 2012-04-29 00:31:09 -0700 (Sun, 29 Apr 2012) | 4 lines

PR12688: ParseCXXClassMemberDeclaration's sometimes-null ThisDecl takes another
victim. Don't crash if we have a delay-parsed exception specification for a
class member which is invalid in a way which precludes building a FunctionDecl.

------------------------------------------------------------------------

llvm-svn: 156676
parent 917e5e1b

clang/lib/Parse/ParseDeclCXX.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2065,7 +2065,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, 
      DeclsInGroup.push_back(ThisDecl);

    }

    

    if (DeclaratorInfo.isFunctionDeclarator() &&

    if (ThisDecl && DeclaratorInfo.isFunctionDeclarator() &&

        DeclaratorInfo.getDeclSpec().getStorageClassSpec()

          != DeclSpec::SCS_typedef) {

      HandleMemberFunctionDeclDelays(DeclaratorInfo, ThisDecl);