diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2019-06-24 05:53:11 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2019-06-24 05:53:11 +0000 |
| commit | 0f0caf1d8363d0265bee6ee5afb3a12370f01c89 (patch) | |
| tree | fa77a834345128a7d658d5de0117aa0e054b8851 /lib/Sema/SemaTemplate.cpp | |
| parent | 11817fac4447f4093b77ef8af5e5229470a7086f (diff) | |
| download | clang-0f0caf1d8363d0265bee6ee5afb3a12370f01c89.tar.gz | |
PR42362: Fix auto deduction of template parameter packs from
type-dependent argument packs.
We need to strip off the PackExpansionExpr to get the real (dependent)
type rather than an opaque DependentTy.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@364165 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 7b0a3a3e09..49ba771379 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -6323,9 +6323,12 @@ ExprResult Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param, // the type is dependent, in order to check the types of non-type template // arguments line up properly in partial ordering. Optional<unsigned> Depth = Param->getDepth() + 1; + Expr *DeductionArg = Arg; + if (auto *PE = dyn_cast<PackExpansionExpr>(DeductionArg)) + DeductionArg = PE->getPattern(); if (DeduceAutoType( Context.getTrivialTypeSourceInfo(ParamType, Param->getLocation()), - Arg, ParamType, Depth) == DAR_Failed) { + DeductionArg, ParamType, Depth) == DAR_Failed) { Diag(Arg->getExprLoc(), diag::err_non_type_template_parm_type_deduction_failure) << Param->getDeclName() << Param->getType() << Arg->getType() |