Skip to content

Swift: make extractor compile again after 6.1 upgrade #19315

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.

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 16 commits into from
Apr 25, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Swift: expand mangling of ExistentialMetatypeType
  • Loading branch information
redsun82 authored and Paolo Tranquilli committed Apr 23, 2025
commit 7834a3d9e4f02b8d03d099a4a5b33beac49b23ee
8 changes: 7 additions & 1 deletion swift/extractor/mangler/SwiftMangler.cpp
Original file line number Diff line number Diff line change
@@ -298,6 +298,12 @@ SwiftMangledName SwiftMangler::visitAnyMetatypeType(const swift::AnyMetatypeType
return initMangled(type) << fetch(type->getInstanceType());
}

SwiftMangledName SwiftMangler::visitExistentialMetatypeType(
const swift::ExistentialMetatypeType* type) {
return visitAnyMetatypeType(type)
<< fetch(const_cast<swift::ExistentialMetatypeType*>(type)->getExistentialInstanceType());
}

SwiftMangledName SwiftMangler::visitDependentMemberType(const swift::DependentMemberType* type) {
return initMangled(type) << fetch(type->getBase()) << fetch(type->getAssocType());
}
@@ -353,7 +359,7 @@ SwiftMangledName SwiftMangler::visitOpaqueTypeArchetypeType(
}

SwiftMangledName SwiftMangler::visitOpenedArchetypeType(const swift::OpenedArchetypeType* type) {
auto *env = type->getGenericEnvironment();
auto* env = type->getGenericEnvironment();
llvm::SmallVector<char> uuid;
env->getOpenedExistentialUUID().toString(uuid);
return visitArchetypeType(type) << std::string_view(uuid.data(), uuid.size());
1 change: 1 addition & 0 deletions swift/extractor/mangler/SwiftMangler.h
Original file line number Diff line number Diff line change
@@ -84,6 +84,7 @@ class SwiftMangler : private swift::TypeVisitor<SwiftMangler, SwiftMangledName>,
SwiftMangledName visitGenericFunctionType(const swift::GenericFunctionType* type);
SwiftMangledName visitGenericTypeParamType(const swift::GenericTypeParamType* type);
SwiftMangledName visitAnyMetatypeType(const swift::AnyMetatypeType* type);
SwiftMangledName visitExistentialMetatypeType(const swift::ExistentialMetatypeType* type);
SwiftMangledName visitDependentMemberType(const swift::DependentMemberType* type);
SwiftMangledName visitInOutType(const swift::InOutType* type);
SwiftMangledName visitExistentialType(const swift::ExistentialType* type);