[clang] fix NestedNameSpecifier dependency calculation

clang/lib/AST/NestedNameSpecifier.cpp

@@ -221,7 +221,8 @@ NestedNameSpecifierDependence NestedNameSpecifier::getDependence() const {
     NestedNameSpecifierDependence Dep =
         toNestedNameSpecifierDependendence(getAsType()->getDependence());
     if (NestedNameSpecifier *Prefix = getPrefix())
-      Dep |= Prefix->getDependence();
+      Dep |=
+          Prefix->getDependence() & ~NestedNameSpecifierDependence::Dependent;
     return Dep;
   }
   }

clang/lib/Sema/SemaCXXScopeSpec.cpp

@@ -31,8 +31,7 @@ static CXXRecordDecl *getCurrentInstantiationOf(QualType T,
   const Type *Ty = T->getCanonicalTypeInternal().getTypePtr();
   if (const RecordType *RecordTy = dyn_cast<RecordType>(Ty)) {
     CXXRecordDecl *Record = cast<CXXRecordDecl>(RecordTy->getDecl());
-    if (!Record->isDependentContext() ||
-        Record->isCurrentInstantiation(CurContext))
+    if (Record->isCurrentInstantiation(CurContext))
       return Record;
 
     return nullptr;

clang/test/SemaTemplate/dependent-names.cpp

@@ -467,3 +467,17 @@ namespace TransformDependentTemplates {
     void f(Arg<int>);
   };
 } // namespace TransformDependentTemplates
+
+namespace TransformNestedName {
+  enum class S { kA };
+
+  template <class T> struct N {
+    using State = S;
+    template <typename T::template X<State::kA> = 0>
+    void F();
+  };
+
+  template <class T>
+  template <typename T::template X<N<T>::State::kA>>
+  inline void N<T>::F() {}
+} // namespace TransformNestedName