diff options
author | David Blaikie <dblaikie@gmail.com> | 2012-02-14 09:00:46 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2012-02-14 09:00:46 +0000 |
commit | 3164c14cadbb09a05ba811602221e9156077cf44 (patch) | |
tree | 7c30e9639e766f0991e2b6d38f7e43c9cbc8a912 /lib/Parse/ParseDeclCXX.cpp | |
parent | 7b8290f7e53e1b9f5521dd284e78ad488a12f0d0 (diff) |
Fix crash-on-invalid for 'operator int[]()' in C++11.
Signed off by Richard Smith.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150464 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
-rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index cc0cf15e73..6213824cae 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -1989,11 +1989,12 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, // declarator is followed by an initializer. // // A brace-or-equal-initializer for a member-declarator is not an - // initializer in the gramamr, so this is ill-formed. + // initializer in the grammar, so this is ill-formed. Diag(Tok, diag::err_incomplete_array_member_init); SkipUntil(tok::comma, true, true); - // Avoid later warnings about a class member of incomplete type. - ThisDecl->setInvalidDecl(); + if (ThisDecl) + // Avoid later warnings about a class member of incomplete type. + ThisDecl->setInvalidDecl(); } else ParseCXXNonStaticMemberInitializer(ThisDecl); } else if (HasInitializer) { |