summaryrefslogtreecommitdiff
path: root/lib/Sema/SemaTemplateInstantiate.cpp
diff options
context:
space:
mode:
authorSimon Pilgrim <llvm-dev@redking.me.uk>2019-06-03 09:56:09 +0000
committerSimon Pilgrim <llvm-dev@redking.me.uk>2019-06-03 09:56:09 +0000
commit396b66e348f1ade4a0ae032e173f9269596a5556 (patch)
tree662cf58885dffd39ac22617e03f8c26c97dc03d3 /lib/Sema/SemaTemplateInstantiate.cpp
parent6767591efeeb1b46faa558f0707bb4efc4315cb9 (diff)
downloadclang-396b66e348f1ade4a0ae032e173f9269596a5556.tar.gz
Revert rL362358 : PR42104: Support instantiations of lambdas that implicitly capture packs.
Two changes: * Track odr-use via FunctionParmPackExprs to properly handle dependent odr-uses of packs in generic lambdas. * Do not instantiate implicit captures; instead, regenerate them by instantiating the body of the lambda. This is necessary to distinguish between cases where only one element of a pack is captured and cases where the entire pack is captured. ........ Fixes http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win buildbot failures git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@362375 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiate.cpp')
-rw-r--r--lib/Sema/SemaTemplateInstantiate.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index 973f564d30..ba54d5010b 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -1368,11 +1368,9 @@ TemplateInstantiator::TransformFunctionParmPackExpr(FunctionParmPackExpr *E) {
Vars.push_back(D);
}
- auto *PackExpr =
- FunctionParmPackExpr::Create(getSema().Context, T, E->getParameterPack(),
- E->getParameterPackLocation(), Vars);
- getSema().MarkFunctionParmPackReferenced(PackExpr);
- return PackExpr;
+ return FunctionParmPackExpr::Create(getSema().Context, T,
+ E->getParameterPack(),
+ E->getParameterPackLocation(), Vars);
}
ExprResult
@@ -1391,10 +1389,8 @@ TemplateInstantiator::TransformFunctionParmPackRefExpr(DeclRefExpr *E,
QualType T = TransformType(E->getType());
if (T.isNull())
return ExprError();
- auto *PackExpr = FunctionParmPackExpr::Create(getSema().Context, T, PD,
- E->getExprLoc(), *Pack);
- getSema().MarkFunctionParmPackReferenced(PackExpr);
- return PackExpr;
+ return FunctionParmPackExpr::Create(getSema().Context, T, PD,
+ E->getExprLoc(), *Pack);
}
TransformedDecl = (*Pack)[getSema().ArgumentPackSubstitutionIndex];