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

AST: Correct handling of ErrorType in TypeBase::getMemberSubstitutions()

Browse Source 
Swift SVN r30531
This commit is contained in:
Slava Pestov
2015-07-23 06:49:19 +00:00
parent 3fae9fff62
commit 0033bda331
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/AST/Type.cpp
View File

@@ -2640,8 +2640,9 @@ TypeSubstitutionMap TypeBase::getMemberSubstitutions(DeclContext *dc) {
LazyResolver *resolver = dc->getASTContext().getLazyResolver(); LazyResolver *resolver = dc->getASTContext().getLazyResolver();
// Find the superclass type with the context matching that of the member. // Find the superclass type with the context matching that of the member.
auto ownerNominal = dc->getDeclaredTypeOfContext()->getAnyNominal(); auto ownerNominal = dc->isNominalTypeOrNominalTypeExtensionContext();
while (baseTy->getAnyNominal() != ownerNominal) { while (!baseTy->is<ErrorType>() &&
baseTy->getAnyNominal() != ownerNominal) {
baseTy = baseTy->getSuperclass(resolver); baseTy = baseTy->getSuperclass(resolver);
assert(baseTy && "Couldn't find appropriate context"); assert(baseTy && "Couldn't find appropriate context");
} }

2
validation-test/compiler_crashers/1003-swift-nominaltypedecl-getdeclaredtypeincontext.swift → validation-test/compiler_crashers_fixed/1003-swift-nominaltypedecl-getdeclaredtypeincontext.swift
View File

@@ -1,4 +1,4 @@
// RUN: not --crash %target-swift-frontend %s -parse // RUN: not %target-swift-frontend %s -parse
// Distributed under the terms of the MIT license // Distributed under the terms of the MIT license
// Test case submitted to project by https://github.com/practicalswift (practicalswift) // Test case submitted to project by https://github.com/practicalswift (practicalswift)

2
validation-test/compiler_crashers/1520-llvm-bitstreamcursor-readrecord.swift → validation-test/compiler_crashers_fixed/1520-llvm-bitstreamcursor-readrecord.swift
View File

@@ -1,4 +1,4 @@
// RUN: not --crash %target-swift-frontend %s -parse // RUN: not %target-swift-frontend %s -parse
// Distributed under the terms of the MIT license // Distributed under the terms of the MIT license
// Test case submitted to project by https://github.com/practicalswift (practicalswift) // Test case submitted to project by https://github.com/practicalswift (practicalswift)

2
validation-test/compiler_crashers/2128-swift-nominaltypedecl-getdeclaredtypeincontext.swift → validation-test/compiler_crashers_fixed/2128-swift-nominaltypedecl-getdeclaredtypeincontext.swift
View File

@@ -1,4 +1,4 @@
// RUN: not --crash %target-swift-frontend %s -parse // RUN: not %target-swift-frontend %s -parse
// Distributed under the terms of the MIT license // Distributed under the terms of the MIT license
// Test case submitted to project by https://github.com/practicalswift (practicalswift) // Test case submitted to project by https://github.com/practicalswift (practicalswift)

2
validation-test/compiler_crashers/2231-swift-nominaltypedecl-getdeclaredtypeincontext.swift → validation-test/compiler_crashers_fixed/2231-swift-nominaltypedecl-getdeclaredtypeincontext.swift
View File

@@ -1,4 +1,4 @@
// RUN: not --crash %target-swift-frontend %s -parse // RUN: not %target-swift-frontend %s -parse
// Distributed under the terms of the MIT license // Distributed under the terms of the MIT license
// Test case submitted to project by https://github.com/practicalswift (practicalswift) // Test case submitted to project by https://github.com/practicalswift (practicalswift)

2
validation-test/compiler_crashers/25410-swift-typechecker-resolvetypeincontext.swift → validation-test/compiler_crashers_fixed/25410-swift-typechecker-resolvetypeincontext.swift
View File

@@ -1,4 +1,4 @@
// RUN: not --crash %target-swift-frontend %s -parse // RUN: not %target-swift-frontend %s -parse
// Distributed under the terms of the MIT license // Distributed under the terms of the MIT license
// Test case submitted to project by https://github.com/practicalswift (practicalswift) // Test case submitted to project by https://github.com/practicalswift (practicalswift)

2
validation-test/compiler_crashers/25429-swift-typechecker-resolvetypeincontext.swift → validation-test/compiler_crashers_fixed/25429-swift-typechecker-resolvetypeincontext.swift
View File

@@ -1,4 +1,4 @@
// RUN: not --crash %target-swift-frontend %s -parse // RUN: not %target-swift-frontend %s -parse
// Distributed under the terms of the MIT license // Distributed under the terms of the MIT license
// Test case submitted to project by https://github.com/practicalswift (practicalswift) // Test case submitted to project by https://github.com/practicalswift (practicalswift)