diff options
| author | Krystian Stasiowski <sdkrystian@gmail.com> | 2024-11-06 06:38:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-06 08:38:59 -0500 |
| commit | 79f4d8f0145d72dff8c33745f35d45c74ecb3fdf (patch) | |
| tree | 1a13885aa626b3d9a95002b0de55503bf782e619 /clang/lib/Sema/SemaDecl.cpp | |
| parent | 246b57cb2086b22ad8b41051c77e86ef478053a1 (diff) | |
| download | llvm-79f4d8f0145d72dff8c33745f35d45c74ecb3fdf.zip llvm-79f4d8f0145d72dff8c33745f35d45c74ecb3fdf.tar.gz llvm-79f4d8f0145d72dff8c33745f35d45c74ecb3fdf.tar.bz2 | |
Revert "Reapply "[Clang][Sema] Always use latest redeclaration of primary template" (#114569)" (#115156)
This reverts commit b24650e814e55d90acfc40acf045456c98f32b9c.
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index c125a7b..39be3f8 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -4694,10 +4694,8 @@ void Sema::MergeVarDecl(VarDecl *New, LookupResult &Previous) { // Keep a chain of previous declarations. New->setPreviousDecl(Old); - if (NewTemplate) { - NewTemplate->mergePrevDecl(OldTemplate); + if (NewTemplate) NewTemplate->setPreviousDecl(OldTemplate); - } // Inherit access appropriately. New->setAccess(Old->getAccess()); |