nridge created this revision. nridge added reviewers: rsmith, mizvekov. Herald added subscribers: kadircet, arphaman. Herald added a project: All. nridge requested review of this revision. Herald added projects: clang, clang-tools-extra. Herald added a subscriber: cfe-commits.
VarTemplateSpecializationDecl does not store a template param list, so the "template<>" needs to be stored in the ExtInfo. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D142692 Files: clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp clang/lib/Sema/SemaDecl.cpp Index: clang/lib/Sema/SemaDecl.cpp =================================================================== --- clang/lib/Sema/SemaDecl.cpp +++ clang/lib/Sema/SemaDecl.cpp @@ -7673,7 +7673,12 @@ // If we have any template parameter lists that don't directly belong to // the variable (matching the scope specifier), store them. - unsigned VDTemplateParamLists = TemplateParams ? 1 : 0; + // An explicit variable template specialization does not own any template + // parameter lists. + bool IsExplicitSpecialization = + IsVariableTemplateSpecialization && !IsPartialSpecialization; + unsigned VDTemplateParamLists = + (TemplateParams && !IsExplicitSpecialization) ? 1 : 0; if (TemplateParamLists.size() > VDTemplateParamLists) NewVD->setTemplateParameterListsInfo( Context, TemplateParamLists.drop_back(VDTemplateParamLists)); Index: clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp +++ clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp @@ -892,7 +892,7 @@ template $Bracket[[<]]typename $TemplateParameter_def[[T]]$Bracket[[>]] $TemplateParameter[[T]] $Variable_def[[x]] = {}; - template <> + template $Bracket[[<]]$Bracket[[>]] int $Variable_def[[x]]$Bracket[[<]]int$Bracket[[>]] = (int)sizeof($Class[[Base]]); )cpp", // operator calls in template @@ -979,7 +979,7 @@ } template $Bracket[[<]]typename $TemplateParameter_def[[T]]$Bracket[[>]] constexpr int $Variable_def_readonly[[V]] = 42; constexpr int $Variable_def_readonly[[Y]] = $Variable_readonly[[V]]$Bracket[[<]]char$Bracket[[>]]; - template <> + template $Bracket[[<]]$Bracket[[>]] constexpr int $Variable_def_readonly[[V]]$Bracket[[<]]int$Bracket[[>]] = 5; template $Bracket[[<]]typename $TemplateParameter_def[[T]]$Bracket[[>]] constexpr int $Variable_def_readonly[[V]]$Bracket[[<]]$TemplateParameter[[T]]*$Bracket[[>]] = 6;
Index: clang/lib/Sema/SemaDecl.cpp =================================================================== --- clang/lib/Sema/SemaDecl.cpp +++ clang/lib/Sema/SemaDecl.cpp @@ -7673,7 +7673,12 @@ // If we have any template parameter lists that don't directly belong to // the variable (matching the scope specifier), store them. - unsigned VDTemplateParamLists = TemplateParams ? 1 : 0; + // An explicit variable template specialization does not own any template + // parameter lists. + bool IsExplicitSpecialization = + IsVariableTemplateSpecialization && !IsPartialSpecialization; + unsigned VDTemplateParamLists = + (TemplateParams && !IsExplicitSpecialization) ? 1 : 0; if (TemplateParamLists.size() > VDTemplateParamLists) NewVD->setTemplateParameterListsInfo( Context, TemplateParamLists.drop_back(VDTemplateParamLists)); Index: clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp =================================================================== --- clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp +++ clang-tools-extra/clangd/unittests/SemanticHighlightingTests.cpp @@ -892,7 +892,7 @@ template $Bracket[[<]]typename $TemplateParameter_def[[T]]$Bracket[[>]] $TemplateParameter[[T]] $Variable_def[[x]] = {}; - template <> + template $Bracket[[<]]$Bracket[[>]] int $Variable_def[[x]]$Bracket[[<]]int$Bracket[[>]] = (int)sizeof($Class[[Base]]); )cpp", // operator calls in template @@ -979,7 +979,7 @@ } template $Bracket[[<]]typename $TemplateParameter_def[[T]]$Bracket[[>]] constexpr int $Variable_def_readonly[[V]] = 42; constexpr int $Variable_def_readonly[[Y]] = $Variable_readonly[[V]]$Bracket[[<]]char$Bracket[[>]]; - template <> + template $Bracket[[<]]$Bracket[[>]] constexpr int $Variable_def_readonly[[V]]$Bracket[[<]]int$Bracket[[>]] = 5; template $Bracket[[<]]typename $TemplateParameter_def[[T]]$Bracket[[>]] constexpr int $Variable_def_readonly[[V]]$Bracket[[<]]$TemplateParameter[[T]]*$Bracket[[>]] = 6;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits