diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-09 21:23:21 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-09 21:23:21 +0000 |
| commit | fdc82ccb3f2b23a89e7002fe8238e1422b00f96a (patch) | |
| tree | f189aa0a3010e0eb212970b8eadf0a8b098985ea /lib/Sema/SemaTemplate.cpp | |
| parent | 6694ed095d6b27a2c92ec4fd63664fcd88a05749 (diff) | |
| download | src-fdc82ccb3f2b23a89e7002fe8238e1422b00f96a.tar.gz src-fdc82ccb3f2b23a89e7002fe8238e1422b00f96a.zip | |
Vendor import of clang trunk r291476:vendor/clang/clang-trunk-r291476
Notes
Notes:
svn path=/vendor/clang/dist/; revision=311820
svn path=/vendor/clang/clang-trunk-r291476/; revision=311821; tag=vendor/clang/clang-trunk-r291476
Diffstat (limited to 'lib/Sema/SemaTemplate.cpp')
| -rw-r--r-- | lib/Sema/SemaTemplate.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp index 66a10ef7993e..795e6025d96f 100644 --- a/lib/Sema/SemaTemplate.cpp +++ b/lib/Sema/SemaTemplate.cpp @@ -5158,6 +5158,11 @@ ExprResult Sema::CheckTemplateArgument(NonTypeTemplateParmDecl *Param, return Arg; } + // The initialization of the parameter from the argument is + // a constant-evaluated context. + EnterExpressionEvaluationContext ConstantEvaluated(*this, + Sema::ConstantEvaluated); + if (getLangOpts().CPlusPlus1z) { // C++1z [temp.arg.nontype]p1: // A template-argument for a non-type template parameter shall be |