Skip to content

AST: Remove old hack that appears to be obsolete and revert a revert of another fix #83986

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 2 commits into from
Aug 29, 2025
+2 −19
Merged

AST: Remove old hack that appears to be obsolete and revert a revert of another fix #83986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
672135b
AST: Remove old hack that appears to be obsolete
slavapestov Aug 28, 2025
161c6f5
Revert "Revert "AST: Re-enable TypeSubstituter::transformSubstitution…
slavapestov Aug 28, 2025
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
14 changes: 0 additions & 14 deletions lib/AST/SubstitutionMap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,20 +283,6 @@ SubstitutionMap::lookupConformance(CanType type, ProtocolDecl *proto) const {

// For each remaining step, project an associated conformance.
while (iter != path.end()) {
// FIXME: Remove this hack. It is unsound, because we may not have diagnosed
// anything but still end up with an ErrorType in the AST.
if (conformance.isConcrete()) {
auto concrete = conformance.getConcrete();
if (auto normal = dyn_cast<NormalProtocolConformance>(concrete->getRootConformance())) {
if (!normal->hasComputedAssociatedConformances()) {
if (proto->getASTContext().evaluator.hasActiveRequest(
ResolveTypeWitnessesRequest{normal})) {
return ProtocolConformanceRef::forInvalid();
}
}
}
}

const auto step = *iter++;
conformance = conformance.getAssociatedConformance(step.first, step.second);
}
Expand Down
5 changes: 1 addition & 4 deletions lib/AST/TypeSubstitution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class TypeSubstituter : public TypeTransform<TypeSubstituter> {
std::optional<Type> transformLocalArchetypeType(LocalArchetypeType *local,
TypePosition pos);

// SubstitutionMap transformSubstitutionMap(SubstitutionMap subs);
SubstitutionMap transformSubstitutionMap(SubstitutionMap subs);

CanType transformSILField(CanType fieldTy, TypePosition pos);
};
Expand Down Expand Up @@ -474,13 +474,10 @@ Type TypeSubstituter::transformDependentMemberType(DependentMemberType *dependen
return result;
}

// FIXME: This exposes a scalability issue; see test/SILGen/opaque_result_type_slow.swift.
/*
SubstitutionMap TypeSubstituter::transformSubstitutionMap(SubstitutionMap subs) {
// FIXME: Take level into account? Move level down into IFS?
return subs.subst(IFS);
}
*/

CanType TypeSubstituter::transformSILField(CanType fieldTy, TypePosition pos) {
// Type substitution does not walk into the SILBoxType's field types, because
Expand Down
2 changes: 1 addition & 1 deletion ...ompiler_crashers_2/174f557922f5c3cc.swift → ...r_crashers_2_fixed/174f557922f5c3cc.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// {"kind":"typecheck","original":"2fdf1565","signature":"(anonymous namespace)::TypeSubstituter::transformDependentMemberType(swift::DependentMemberType*, swift::TypePosition)","stackOverflow":true}
// RUN: not --crash %target-swift-frontend -typecheck %s
// RUN: not %target-swift-frontend -typecheck %s
protocol a {
typealias b = c
associatedtype d: b
Expand Down