diff options
| -rw-r--r-- | clang/lib/Parse/ParseExprCXX.cpp | 19 | ||||
| -rw-r--r-- | clang/test/Parser/lambda-attr.cu | 33 |
2 files changed, 45 insertions, 7 deletions
diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp index 35661d51d09..2287e072730 100644 --- a/clang/lib/Parse/ParseExprCXX.cpp +++ b/clang/lib/Parse/ParseExprCXX.cpp @@ -1124,7 +1124,17 @@ ExprResult Parser::ParseLambdaExpressionAfterIntroducer( DeclSpec DS(AttrFactory); Declarator D(DS, Declarator::LambdaExprContext); TemplateParameterDepthRAII CurTemplateDepthTracker(TemplateParameterDepth); - Actions.PushLambdaScope(); + Actions.PushLambdaScope(); + + ParsedAttributes Attr(AttrFactory); + SourceLocation DeclLoc = Tok.getLocation(); + SourceLocation DeclEndLoc = DeclLoc; + if (getLangOpts().CUDA) { + // In CUDA code, GNU attributes are allowed to appear immediately after the + // "[...]", even if there is no "(...)" before the lambda body. + MaybeParseGNUAttributes(Attr, &DeclEndLoc); + D.takeAttributes(Attr, DeclEndLoc); + } TypeResult TrailingReturnType; if (Tok.is(tok::l_paren)) { @@ -1133,13 +1143,11 @@ ExprResult Parser::ParseLambdaExpressionAfterIntroducer( Scope::FunctionDeclarationScope | Scope::DeclScope); - SourceLocation DeclEndLoc; BalancedDelimiterTracker T(*this, tok::l_paren); T.consumeOpen(); SourceLocation LParenLoc = T.getOpenLocation(); // Parse parameter-declaration-clause. - ParsedAttributes Attr(AttrFactory); SmallVector<DeclaratorChunk::ParamInfo, 16> ParamInfo; SourceLocation EllipsisLoc; @@ -1245,12 +1253,10 @@ ExprResult Parser::ParseLambdaExpressionAfterIntroducer( Diag(Tok, diag::err_lambda_missing_parens) << TokKind << FixItHint::CreateInsertion(Tok.getLocation(), "() "); - SourceLocation DeclLoc = Tok.getLocation(); - SourceLocation DeclEndLoc = DeclLoc; + DeclEndLoc = DeclLoc; // GNU-style attributes must be parsed before the mutable specifier to be // compatible with GCC. - ParsedAttributes Attr(AttrFactory); MaybeParseGNUAttributes(Attr, &DeclEndLoc); // Parse 'mutable', if it's there. @@ -1297,7 +1303,6 @@ ExprResult Parser::ParseLambdaExpressionAfterIntroducer( TrailingReturnType), Attr, DeclEndLoc); } - // FIXME: Rename BlockScope -> ClosureScope if we decide to continue using // it. diff --git a/clang/test/Parser/lambda-attr.cu b/clang/test/Parser/lambda-attr.cu new file mode 100644 index 00000000000..c51e0a2b9d9 --- /dev/null +++ b/clang/test/Parser/lambda-attr.cu @@ -0,0 +1,33 @@ +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify %s +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -fcuda-is-device -verify %s + +// expected-no-diagnostics + +__attribute__((device)) void device_fn() {} +__attribute__((device)) void hd_fn() {} + +__attribute__((device)) void device_attr() { + ([]() __attribute__((device)) { device_fn(); })(); + ([] __attribute__((device)) () { device_fn(); })(); + ([] __attribute__((device)) { device_fn(); })(); + + ([&]() __attribute__((device)){ device_fn(); })(); + ([&] __attribute__((device)) () { device_fn(); })(); + ([&] __attribute__((device)) { device_fn(); })(); + + ([&](int) __attribute__((device)){ device_fn(); })(0); + ([&] __attribute__((device)) (int) { device_fn(); })(0); +} + +__attribute__((host)) __attribute__((device)) void host_device_attrs() { + ([]() __attribute__((host)) __attribute__((device)){ hd_fn(); })(); + ([] __attribute__((host)) __attribute__((device)) () { hd_fn(); })(); + ([] __attribute__((host)) __attribute__((device)) { hd_fn(); })(); + + ([&]() __attribute__((host)) __attribute__((device)){ hd_fn(); })(); + ([&] __attribute__((host)) __attribute__((device)) () { hd_fn(); })(); + ([&] __attribute__((host)) __attribute__((device)) { hd_fn(); })(); + + ([&](int) __attribute__((host)) __attribute__((device)){ hd_fn(); })(0); + ([&] __attribute__((host)) __attribute__((device)) (int) { hd_fn(); })(0); +} |
