Author: jlebar Date: Fri Sep 30 12:14:48 2016 New Revision: 282879 URL: http://llvm.org/viewvc/llvm-project?rev=282879&view=rev Log: [CUDA] Handle attributes on CUDA lambdas appearing between [...] and (...).
Summary: This is ugh, but it makes us compatible with NVCC. Fixes bug 26341. Reviewers: rnk Subscribers: cfe-commits, tra Differential Revision: https://reviews.llvm.org/D25103 Added: cfe/trunk/test/Parser/lambda-attr.cu Modified: cfe/trunk/lib/Parse/ParseExprCXX.cpp Modified: cfe/trunk/lib/Parse/ParseExprCXX.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExprCXX.cpp?rev=282879&r1=282878&r2=282879&view=diff ============================================================================== --- cfe/trunk/lib/Parse/ParseExprCXX.cpp (original) +++ cfe/trunk/lib/Parse/ParseExprCXX.cpp Fri Sep 30 12:14:48 2016 @@ -1124,7 +1124,17 @@ ExprResult Parser::ParseLambdaExpression 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::ParseLambdaExpression 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::ParseLambdaExpression 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::ParseLambdaExpression TrailingReturnType), Attr, DeclEndLoc); } - // FIXME: Rename BlockScope -> ClosureScope if we decide to continue using // it. Added: cfe/trunk/test/Parser/lambda-attr.cu URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/lambda-attr.cu?rev=282879&view=auto ============================================================================== --- cfe/trunk/test/Parser/lambda-attr.cu (added) +++ cfe/trunk/test/Parser/lambda-attr.cu Fri Sep 30 12:14:48 2016 @@ -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); +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
