Skip to content

Sema: Fix crash with unbound generic types in patterns #10144

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
Jun 6, 2017
Merged

Sema: Fix crash with unbound generic types in patterns #10144

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
1bd91de
Sema: Fix crash with unbound generic types in patterns
slavapestov Jun 6, 2017
56b61ba
Sema: Don't build ErrorTypes in simplifyType()
slavapestov Jun 6, 2017
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
16 changes: 8 additions & 8 deletions lib/Sema/ConstraintSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1700,17 +1700,17 @@ Type simplifyTypeImpl(ConstraintSystem &cs, Type type, Fn getFixedTypeFn) {
lookupBaseType = objectType;
}

if (!lookupBaseType->mayHaveMembers()) return type;

auto subs = lookupBaseType->getContextSubstitutionMap(
if (lookupBaseType->mayHaveMembers()) {
auto subs = lookupBaseType->getContextSubstitutionMap(
cs.DC->getParentModule(),
assocType->getDeclContext());
auto result = assocType->getDeclaredInterfaceType().subst(subs);
assocType->getDeclContext());
auto result = assocType->getDeclaredInterfaceType().subst(subs);

if (result)
return result;
if (result)
return result;
}

return DependentMemberType::get(ErrorType::get(newBase), assocType);
return DependentMemberType::get(lookupBaseType, assocType);
}

return type;
Expand Down
6 changes: 6 additions & 0 deletions lib/Sema/TypeCheckPattern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,6 +869,12 @@ bool TypeChecker::typeCheckPattern(Pattern *P, DeclContext *dc,
case PatternKind::Typed: {
TypedPattern *TP = cast<TypedPattern>(P);
bool hadError = validateTypedPattern(*this, dc, TP, options, &resolver);

// If we have unbound generic types, don't apply them below; instead,
// the caller will call typeCheckBinding() later.
if (P->getType()->hasUnboundGenericType())
return hadError;

Pattern *subPattern = TP->getSubPattern();
if (coercePatternToType(subPattern, dc, P->getType(),
options|TR_FromNonInferredPattern, &resolver,
Expand Down
2 changes: 1 addition & 1 deletion ...erictype-valuetype-hastypeparameter.swift → ...erictype-valuetype-hastypeparameter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// REQUIRES: asserts
// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
guard let f==A:UnfoldSequence