Skip to content

[cxx-interop] Simplify name generation for template arguments of builtin types #77555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2024
Merged

[cxx-interop] Simplify name generation for template arguments of builtin types #77555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions lib/ClangImporter/ClangClassTemplateNamePrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,19 @@ struct TemplateInstantiationNamePrinter
}

std::string VisitBuiltinType(const clang::BuiltinType *type) {
Type swiftType = nullptr;
switch (type->getKind()) {
case clang::BuiltinType::Void:
swiftType =
swiftCtx.getNamedSwiftType(swiftCtx.getStdlibModule(), "Void");
break;
return "Void";

#define MAP_BUILTIN_TYPE(CLANG_BUILTIN_KIND, SWIFT_TYPE_NAME) \
case clang::BuiltinType::CLANG_BUILTIN_KIND: \
swiftType = swiftCtx.getNamedSwiftType(swiftCtx.getStdlibModule(), \
#SWIFT_TYPE_NAME); \
break;
#define MAP_BUILTIN_CCHAR_TYPE(CLANG_BUILTIN_KIND, SWIFT_TYPE_NAME) \
case clang::BuiltinType::CLANG_BUILTIN_KIND: \
swiftType = swiftCtx.getNamedSwiftType(swiftCtx.getStdlibModule(), \
#SWIFT_TYPE_NAME); \
break;
case clang::BuiltinType::CLANG_BUILTIN_KIND: \
return #SWIFT_TYPE_NAME;
#include "swift/ClangImporter/BuiltinMappedTypes.def"
default:
break;
}

if (swiftType) {
if (swiftType->is<NominalType>() || swiftType->isVoid()) {
return swiftType->getStringAsComponent();
}
}
return "_";
return VisitType(type);
}

std::string VisitTagType(const clang::TagType *type) {
Expand Down