diff options
Diffstat (limited to 'lib/AST')
| -rw-r--r-- | lib/AST/ExprCXX.cpp | 7 | ||||
| -rw-r--r-- | lib/AST/StmtPrinter.cpp | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp index 4d9f05a028..6825390772 100644 --- a/lib/AST/ExprCXX.cpp +++ b/lib/AST/ExprCXX.cpp @@ -752,6 +752,7 @@ LambdaExpr::LambdaExpr(QualType T, LambdaCaptureDefault CaptureDefault, ArrayRef<Capture> Captures, bool ExplicitParams, + bool ExplicitResultType, ArrayRef<Expr *> CaptureInits, ArrayRef<VarDecl *> ArrayIndexVars, ArrayRef<unsigned> ArrayIndexStarts, @@ -763,6 +764,7 @@ LambdaExpr::LambdaExpr(QualType T, NumCaptures(Captures.size()), CaptureDefault(CaptureDefault), ExplicitParams(ExplicitParams), + ExplicitResultType(ExplicitResultType), ClosingBrace(ClosingBrace) { assert(CaptureInits.size() == Captures.size() && "Wrong number of arguments"); @@ -810,6 +812,7 @@ LambdaExpr *LambdaExpr::Create(ASTContext &Context, LambdaCaptureDefault CaptureDefault, ArrayRef<Capture> Captures, bool ExplicitParams, + bool ExplicitResultType, ArrayRef<Expr *> CaptureInits, ArrayRef<VarDecl *> ArrayIndexVars, ArrayRef<unsigned> ArrayIndexStarts, @@ -824,8 +827,8 @@ LambdaExpr *LambdaExpr::Create(ASTContext &Context, + sizeof(unsigned) * (Captures.size() + 1); void *Mem = Context.Allocate(Size); return new (Mem) LambdaExpr(T, IntroducerRange, CaptureDefault, - Captures, ExplicitParams, CaptureInits, - ArrayIndexVars, ArrayIndexStarts, + Captures, ExplicitParams, ExplicitResultType, + CaptureInits, ArrayIndexVars, ArrayIndexStarts, ClosingBrace); } diff --git a/lib/AST/StmtPrinter.cpp b/lib/AST/StmtPrinter.cpp index 292d593c7a..746049b166 100644 --- a/lib/AST/StmtPrinter.cpp +++ b/lib/AST/StmtPrinter.cpp @@ -1344,9 +1344,9 @@ void StmtPrinter::VisitLambdaExpr(LambdaExpr *Node) { // FIXME: Attributes - // FIXME: Suppress trailing return type if it wasn't specified in - // the source. - OS << " -> " << Proto->getResultType().getAsString(Policy); + // Print the trailing return type if it was specified in the source. + if (Node->hasExplicitResultType()) + OS << " -> " << Proto->getResultType().getAsString(Policy); } // Print the body. |