diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-06-11 00:49:52 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-06-11 00:49:52 +0000 |
| commit | edcb26e61b8382cff453775fa82c3d601e862d62 (patch) | |
| tree | add6fa90fa238484a8af02ce43c06cd725be113a /clang/lib/Parse/ParseDeclCXX.cpp | |
| parent | 7c9d4e058a671c8abf2c49bf3fe49aff3d91ca1f (diff) | |
| download | bcm5719-llvm-edcb26e61b8382cff453775fa82c3d601e862d62.tar.gz bcm5719-llvm-edcb26e61b8382cff453775fa82c3d601e862d62.zip | |
PR19993: don't assert/crash if a static data member is initialized by '= delete;'.
llvm-svn: 210617
Diffstat (limited to 'clang/lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDeclCXX.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index ab4dfd01b1f..5ec899f5898 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -2466,7 +2466,7 @@ ExprResult Parser::ParseCXXMemberInitializer(Decl *D, bool IsFunction, << 1 /* delete */; else Diag(ConsumeToken(), diag::err_deleted_non_function); - return ExprResult(); + return ExprError(); } } else if (Tok.is(tok::kw_default)) { if (IsFunction) @@ -2474,7 +2474,7 @@ ExprResult Parser::ParseCXXMemberInitializer(Decl *D, bool IsFunction, << 0 /* default */; else Diag(ConsumeToken(), diag::err_default_special_members); - return ExprResult(); + return ExprError(); } } |
