averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with runtime reporting incorrect types for nested generics

Browse Source 
Fixes: https://github.com/apple/swift/issues/60565
This commit is contained in:
Nuri Amari
2022-10-27 14:12:06 -07:00
parent dc3978f6fb
commit 66f993194a
3 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/swift/Remote/MetadataReader.h
View File

@@ -2906,9 +2906,11 @@ private:
template <
typename T = BuilderType,
typename std::enable_if_t<
!std::is_same<
bool,
decltype(T::needsToPrecomputeParentGenericContextShapes)>::value,
!(std::is_same<
const bool,
decltype(T::needsToPrecomputeParentGenericContextShapes)>::
value &&
T::needsToPrecomputeParentGenericContextShapes),
bool> = true>
BuiltTypeDecl buildNominalTypeDecl(ContextDescriptorRef descriptor) {
// Build the demangling tree from the context tree.
@@ -2921,13 +2923,14 @@ private:
return decl;
}
template <
typename T = BuilderType,
typename std::enable_if_t<
std::is_same<
bool,
decltype(T::needsToPrecomputeParentGenericContextShapes)>::value,
bool> = true>
template <typename T = BuilderType,
typename std::enable_if_t<
std::is_same<
const bool,
decltype(T::needsToPrecomputeParentGenericContextShapes)>::
value &&
T::needsToPrecomputeParentGenericContextShapes,
bool> = true>
BuiltTypeDecl buildNominalTypeDecl(ContextDescriptorRef descriptor) {
// Build the demangling tree from the context tree.
Demangler dem;
@@ -2944,12 +2947,17 @@ private:
countLevels(parentContext, runningCount);
auto genericContext = current->getGenericContext();
if (!genericContext)
return;
auto contextHeader = genericContext->getGenericContextHeader();
paramsPerLevel.emplace_back(contextHeader.NumParams - runningCount);
runningCount += paramsPerLevel.back();
// Only consider generic contexts of type class, enum or struct.
// There are other context types that can be generic, but they should
// not affect the generic shape.
if (genericContext &&
(current->getKind() == ContextDescriptorKind::Class ||
current->getKind() == ContextDescriptorKind::Enum ||
current->getKind() == ContextDescriptorKind::Struct)) {
auto contextHeader = genericContext->getGenericContextHeader();
paramsPerLevel.emplace_back(contextHeader.NumParams - runningCount);
runningCount += paramsPerLevel.back();
}
};
countLevels(descriptor, runningCount);
BuiltTypeDecl decl = Builder.createTypeDecl(node, paramsPerLevel);