Merge pull request #35222 from zoecarver/cxx/fix-using-shadow

[cxx-interop] Using shadow with class template.

Author: zoecarver

lib/ClangImporter/ImportDecl.cpp

@@ -4458,8 +4458,10 @@ namespace {
         return nullptr;
 
       Decl *SwiftDecl = Impl.importDecl(decl->getUnderlyingDecl(), getActiveSwiftVersion());
+      if (!SwiftDecl)
+        return nullptr;
+
       const TypeDecl *SwiftTypeDecl = dyn_cast<TypeDecl>(SwiftDecl);
-      
       if (!SwiftTypeDecl)
         return nullptr;
 

test/Interop/Cxx/class/Inputs/type-classification.h

@@ -189,4 +189,10 @@ struct StructWithCopyConstructorAndSubobjectCopyConstructorAndValue {
       : member(other.member) {}
 };
 
+template<class> struct DependentParent { struct Child { }; };
+
+struct HasUnsupportedUsingShadow : DependentParent<int> {
+  using typename DependentParent<int>::Child;
+};
+
 #endif // TEST_INTEROP_CXX_CLASS_INPUTS_TYPE_CLASSIFICATION_H