diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2021-09-09 20:15:13 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-12-06 16:30:04 +0000 |
| commit | c77c1b5c48476e0b0f6d3f4ea9dbf2c744eb1765 (patch) | |
| tree | 185df692fb11e55830e03f2bc7e3a6cd2f7c4867 /contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | |
| parent | 2e2f8eac752cf13bc0f0c5aabf0ae9e5ef22c360 (diff) | |
| download | src-c77c1b5c48476e0b0f6d3f4ea9dbf2c744eb1765.tar.gz src-c77c1b5c48476e0b0f6d3f4ea9dbf2c744eb1765.zip | |
Merge llvm-project release/13.x llvmorg-13.0.0-rc2-43-gf56129fe78d5
This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and
openmp to llvmorg-13.0.0-rc2-43-gf56129fe78d5.
PR: 258209
(cherry picked from commit 69ade1e033e478ec426cafc0ec2104d672de294a)
Diffstat (limited to 'contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp')
| -rw-r--r-- | contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp index be4c51930789..25f134868758 100644 --- a/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -1087,7 +1087,7 @@ Decl *TemplateDeclInstantiator::VisitVarDecl(VarDecl *D, SemaRef.BuildVariableInstantiation(Var, D, TemplateArgs, LateAttrs, Owner, StartingScope, InstantiatingVarTemplate); - if (D->isNRVOVariable()) { + if (D->isNRVOVariable() && !Var->isInvalidDecl()) { QualType RT; if (auto *F = dyn_cast<FunctionDecl>(DC)) RT = F->getReturnType(); |