From bda8632f9b51b0958b242ba1b2f161cf7470d461 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Wed, 4 Feb 2015 08:22:46 +0000 Subject: [PATCH] Parse: Handle __declspec in a lambda definition llvm-svn: 228121 --- clang/lib/Parse/ParseExprCXX.cpp | 5 +++++ clang/test/SemaCXX/ms-novtable.cpp | 1 + 2 files changed, 6 insertions(+) diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp index 10ae450fe893..445967bfab8f 100644 --- a/clang/lib/Parse/ParseExprCXX.cpp +++ b/clang/lib/Parse/ParseExprCXX.cpp @@ -1085,6 +1085,11 @@ ExprResult Parser::ParseLambdaExpressionAfterIntroducer( // compatible with GCC. MaybeParseGNUAttributes(Attr, &DeclEndLoc); + // MSVC-style attributes must be parsed before the mutable specifier to be + // compatible with MSVC. + while (Tok.is(tok::kw___declspec)) + ParseMicrosoftDeclSpec(Attr); + // Parse 'mutable'[opt]. SourceLocation MutableLoc; if (TryConsumeToken(tok::kw_mutable, MutableLoc)) diff --git a/clang/test/SemaCXX/ms-novtable.cpp b/clang/test/SemaCXX/ms-novtable.cpp index 6dd949d57dbf..2d55c48df3c7 100644 --- a/clang/test/SemaCXX/ms-novtable.cpp +++ b/clang/test/SemaCXX/ms-novtable.cpp @@ -4,3 +4,4 @@ struct __declspec(novtable) S {}; enum __declspec(novtable) E {}; // expected-warning{{'novtable' attribute only applies to classes}} int __declspec(novtable) I; // expected-warning{{'novtable' attribute only applies to classes}} typedef struct T __declspec(novtable) U; // expected-warning{{'novtable' attribute only applies to classes}} +auto z = []() __declspec(novtable) { return nullptr; }; // expected-warning{{'novtable' attribute only applies to classes}}