Skip to content

Don't resolve a generic type parameter type from null environments #6090

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
Dec 6, 2016
Merged

Don't resolve a generic type parameter type from null environments #6090

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion lib/Sema/TypeCheckGeneric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ Type GenericTypeToArchetypeResolver::resolveGenericTypeParamType(
if (gpDecl->isInvalid())
return ErrorType::get(gpDecl->getASTContext());

return GenericEnv->mapTypeIntoContext(gp);
if (auto *Env = GenericEnv)
return Env->mapTypeIntoContext(gp);

return ErrorType::get(gpDecl->getASTContext());
}

Type GenericTypeToArchetypeResolver::resolveDependentMemberType(
Expand Down
8 changes: 0 additions & 8 deletions validation-test/IDE/crashers/099-swift-genericenvironment-maptypeintocontext.swift
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions validation-test/IDE/crashers_fixed/099-swift-genericenvironment-maptypeintocontext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// RUN: %target-swift-ide-test -code-completion -code-completion-token=A -source-filename=%s
a{
protocol e{
typealias e
extension{
let b{let a={
#^A^#func f:e
2 changes: 1 addition & 1 deletion ...0xc27624-0xc2741f-0xc25bb5-0xbcdbbb.swift → ...0xc27624-0xc2741f-0xc25bb5-0xbcdbbb.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

// RUN: not --crash %target-swift-frontend %s -emit-ir
// RUN: not %target-swift-frontend %s -emit-ir
{associatedtype b<T>func c:[T