Merge pull request #77531 from swiftlang/egorzhdan/class-template-enums

[cxx-interop] Disambiguate template instantiations with enum parameters

Author: egorzhdan

lib/ClangImporter/ClangClassTemplateNamePrinter.cpp

@@ -64,7 +64,7 @@ struct TemplateInstantiationNamePrinter
     return "_";
   }
 
-  std::string VisitRecordType(const clang::RecordType *type) {
+  std::string VisitTagType(const clang::TagType *type) {
     auto tagDecl = type->getAsTagDecl();
     if (auto namedArg = dyn_cast_or_null<clang::NamedDecl>(tagDecl)) {
       if (auto typeDefDecl = tagDecl->getTypedefNameForAnonDecl())

test/Interop/Cxx/templates/Inputs/class-template-with-enum-parameter.h

@@ -0,0 +1,17 @@
+#ifndef TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_ENUM_PARAMETER_H
+#define TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_ENUM_PARAMETER_H
+
+template <class T>
+struct Wrapper {
+  T t;
+};
+
+enum MyEnum { MyEnum_a, MyEnum_b };
+enum class MyEnumClass { a, b };
+typedef enum { MyTypedefEnum_a, MyTypedefEnum_b } MyTypedefEnum;
+
+typedef Wrapper<MyEnum> WrappedEnum;
+typedef Wrapper<MyEnumClass> WrappedEnumClass;
+typedef Wrapper<MyTypedefEnum> WrappedTypedefEnum;
+
+#endif // TEST_INTEROP_CXX_TEMPLATES_INPUTS_CLASS_TEMPLATE_WITH_ENUM_PARAMETER_H

test/Interop/Cxx/templates/Inputs/module.modulemap

@@ -8,6 +8,11 @@ module ClassTemplateWithPrimitiveArgument {
   requires cplusplus
 }
 
+module ClassTemplateWithEnumParameter {
+  header "class-template-with-enum-parameter.h"
+  requires cplusplus
+}
+
 module ClassTemplateWithFunctionParameter {
   header "class-template-with-function-parameter.h"
   requires cplusplus

test/Interop/Cxx/templates/class-template-with-enum-parameter-module-interface.swift

@@ -0,0 +1,5 @@
+// RUN: %target-swift-ide-test -print-module -module-to-print=ClassTemplateWithEnumParameter -I %S/Inputs -source-filename=x -cxx-interoperability-mode=upcoming-swift | %FileCheck %s
+
+// CHECK: typealias WrappedEnum = Wrapper<MyEnum>
+// CHECK: typealias WrappedEnumClass = Wrapper<MyEnumClass>
+// CHECK: typealias WrappedTypedefEnum = Wrapper<MyTypedefEnum>