fixup

Author: mizvekov

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -5292,7 +5292,12 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation,
                               });
       assert(It != Primary->redecls().end() &&
              "Should't get here without a definition");
-      DC = (*It)->getLexicalDeclContext();
+      if (FunctionDecl *Def = cast<FunctionTemplateDecl>(*It)
+                                  ->getTemplatedDecl()
+                                  ->getDefinition())
+        DC = Def->getLexicalDeclContext();
+      else
+        DC = (*It)->getLexicalDeclContext();
       Innermost.emplace(Function->getTemplateSpecializationArgs()->asArray());
     }
     MultiLevelTemplateArgumentList TemplateArgs = getTemplateInstantiationArgs(

clang/test/SemaTemplate/GH55509.cpp

@@ -99,3 +99,14 @@ namespace regression1 {
 
   template void foo<int>(A<int>);
 } // namespace regression1
+namespace regression2 {
+  template <class> struct A {
+    template <class T> static void f() {
+      A<int>::f<T>();
+    }
+  };
+  template <> template <class T> void A<int>::f() {
+    static_assert(__is_same(T, long));
+  }
+  template void A<void>::f<long>();
+} // namespace regression2