diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-02-17 19:36:19 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-02-17 19:36:19 +0000 |
| commit | eb2854521a26d3f186018f1b119761ca7bb90dc2 (patch) | |
| tree | 8cb7e2fc50b6c6580827cc26dc7c9a5921b4bdb2 /lib/Sema/SemaTemplateVariadic.cpp | |
| parent | 3bae5253046bf2859f76e3d0d22f47a5fc0844c7 (diff) | |
| download | src-eb2854521a26d3f186018f1b119761ca7bb90dc2.tar.gz src-eb2854521a26d3f186018f1b119761ca7bb90dc2.zip | |
Vendor import of clang release_40 branch r295380:vendor/clang/clang-release_40-r295380
Notes
Notes:
svn path=/vendor/clang/dist/; revision=313883
svn path=/vendor/clang/clang-release_40-r295380/; revision=313884; tag=vendor/clang/clang-release_40-r295380
Diffstat (limited to 'lib/Sema/SemaTemplateVariadic.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplateVariadic.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplateVariadic.cpp b/lib/Sema/SemaTemplateVariadic.cpp index 54556b505ee0..725a3e425201 100644 --- a/lib/Sema/SemaTemplateVariadic.cpp +++ b/lib/Sema/SemaTemplateVariadic.cpp @@ -1014,6 +1014,11 @@ ExprResult Sema::ActOnCXXFoldExpr(SourceLocation LParenLoc, Expr *LHS, CheckFoldOperand(*this, LHS); CheckFoldOperand(*this, RHS); + auto DiscardOperands = [&] { + CorrectDelayedTyposInExpr(LHS); + CorrectDelayedTyposInExpr(RHS); + }; + // [expr.prim.fold]p3: // In a binary fold, op1 and op2 shall be the same fold-operator, and // either e1 shall contain an unexpanded parameter pack or e2 shall contain @@ -1021,6 +1026,7 @@ ExprResult Sema::ActOnCXXFoldExpr(SourceLocation LParenLoc, Expr *LHS, if (LHS && RHS && LHS->containsUnexpandedParameterPack() == RHS->containsUnexpandedParameterPack()) { + DiscardOperands(); return Diag(EllipsisLoc, LHS->containsUnexpandedParameterPack() ? diag::err_fold_expression_packs_both_sides @@ -1034,6 +1040,7 @@ ExprResult Sema::ActOnCXXFoldExpr(SourceLocation LParenLoc, Expr *LHS, if (!LHS || !RHS) { Expr *Pack = LHS ? LHS : RHS; assert(Pack && "fold expression with neither LHS nor RHS"); + DiscardOperands(); if (!Pack->containsUnexpandedParameterPack()) return Diag(EllipsisLoc, diag::err_pack_expansion_without_parameter_packs) << Pack->getSourceRange(); |