[clang] Distinguish NTTPs with deduced types in variable template partial specializations

If a template argument in a partial specialization of a variable template directly refers to a NTTP of the
specialization without implicit type conversion it was assumed that the NTTP is identical to that of the
primary template.

This doesn't hold if the primary template's NTTP uses a deduced type, so instead compare the types explicitly
as well.

Fixes #118190
Fixes #152750

Author: keinflue

clang/lib/Sema/SemaTemplate.cpp

@@ -4126,7 +4126,11 @@ static bool isTemplateArgumentTemplateParameter(const TemplateArgument &Arg,
       return false;
     const NonTypeTemplateParmDecl *NTTP =
         dyn_cast<NonTypeTemplateParmDecl>(DRE->getDecl());
-    return NTTP && NTTP->getDepth() == Depth && NTTP->getIndex() == Index;
+    if (!NTTP || NTTP->getDepth() != Depth || NTTP->getIndex() != Index)
+      return false;
+    QualType ParamType = cast<NonTypeTemplateParmDecl>(Param)->getType();
+    QualType NTTPType = NTTP->getType();
+    return ParamType.getCanonicalType() == NTTPType.getCanonicalType();
   }
 
   case TemplateArgument::Template:

clang/test/SemaTemplate/temp_arg_nontype_cxx1z.cpp

@@ -621,3 +621,8 @@ namespace GH73460 {
   int j;
   template struct A<int&, j, j>;
 } // namespace GH73460
+
+namespace GH118190 {
+  template <auto> int x;
+  template <int i> int x<i>;
+}