Author: Ilya Golovenko Date: 2020-07-16T12:50:25+02:00 New Revision: a130cf8ae8ab56ba1cfa7edc52b637c9d0c3fd38
URL: https://github.com/llvm/llvm-project/commit/a130cf8ae8ab56ba1cfa7edc52b637c9d0c3fd38 DIFF: https://github.com/llvm/llvm-project/commit/a130cf8ae8ab56ba1cfa7edc52b637c9d0c3fd38.diff LOG: [clang] Fix printing of lambdas with capture expressions Patch by @walrus ! Reviewers: lattner, kadircet Reviewed By: kadircet Subscribers: riccibruno, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D83855 Added: Modified: clang/lib/AST/StmtPrinter.cpp clang/test/AST/ast-printer-lambda.cpp Removed: ################################################################################ diff --git a/clang/lib/AST/StmtPrinter.cpp b/clang/lib/AST/StmtPrinter.cpp index f797f5fe8e6d..ea160025ae3d 100644 --- a/clang/lib/AST/StmtPrinter.cpp +++ b/clang/lib/AST/StmtPrinter.cpp @@ -2005,8 +2005,23 @@ void StmtPrinter::VisitLambdaExpr(LambdaExpr *Node) { if (C->isPackExpansion()) OS << "..."; - if (Node->isInitCapture(C)) - PrintExpr(C->getCapturedVar()->getInit()); + if (Node->isInitCapture(C)) { + VarDecl *D = C->getCapturedVar(); + + llvm::StringRef Pre; + llvm::StringRef Post; + if (D->getInitStyle() == VarDecl::CallInit && + !isa<ParenListExpr>(D->getInit())) { + Pre = "("; + Post = ")"; + } else if (D->getInitStyle() == VarDecl::CInit) { + Pre = " = "; + } + + OS << Pre; + PrintExpr(D->getInit()); + OS << Post; + } } OS << ']'; diff --git a/clang/test/AST/ast-printer-lambda.cpp b/clang/test/AST/ast-printer-lambda.cpp index 27a361da5cb1..08f1ff555b0b 100644 --- a/clang/test/AST/ast-printer-lambda.cpp +++ b/clang/test/AST/ast-printer-lambda.cpp @@ -15,6 +15,18 @@ void test1(int i, T... t) { auto lambda = [&]{}; //CHECK: [&] { } +{ + auto lambda = [k{i}] {}; + //CHECK: [k{i}] { +} +{ + auto lambda = [k(i)] {}; + //CHECK: [k(i)] { +} +{ + auto lambda = [k = i] {}; + //CHECK: [k = i] { +} { auto lambda = [t..., i]{}; //CHECK: [t..., i] { @@ -31,6 +43,14 @@ void test1(int i, T... t) { auto lambda = [t..., this]{}; //CHECK: [t..., this] { } +{ + auto lambda = [k(t...)] {}; + //CHECK: [k(t...)] { +} +{ + auto lambda = [k{t...}] {}; + //CHECK: [k{t...}] { +} } }; \ No newline at end of file _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
