Merge pull request #11513 from swiftlang/lldb/injected-class-name-to-21.x

[lldb][TypeSystemClang] Don't call getInjectedClassNameType when creating class template decls

Author: Michael137

lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp

@@ -1640,9 +1640,6 @@ ClassTemplateDecl *TypeSystemClang::CreateClassTemplateDecl(
   class_template_decl->init(template_cxx_decl);
   template_cxx_decl->setDescribedClassTemplate(class_template_decl);
   SetOwningModule(class_template_decl, owning_module);
-  ast.getInjectedClassNameType(
-      template_cxx_decl,
-      class_template_decl->getInjectedClassNameSpecialization());
 
   if (access_type != eAccessNone)
     class_template_decl->setAccess(

lldb/unittests/Symbol/TestTypeSystemClang.cpp

@@ -685,9 +685,7 @@ TEST_F(TestCreateClassTemplateDecl, FindExistingTemplates) {
   // The behaviour should follow the C++ rules for redeclaring templates
   // (e.g., parameter names can be changed/omitted.)
 
-  // Test an empty template parameter list: <>
-  // This first expect causes an assert. rdar://159893045
-  // ExpectNewTemplate("<>", {{}, {}});
+  ExpectNewTemplate("<>", {{}, {}});
 
   clang::TemplateArgument intArg(m_ast->getASTContext().IntTy);
   clang::TemplateArgument int47Arg(m_ast->getASTContext(),