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

[Sema] Improve handling of invalid protocols during conformance checking

Browse Source
This commit is contained in:
Jacob Bandes-Storch
2016-01-07 22:25:11 -08:00
parent 25a999063c
commit 8cc8c5cc22
6 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AST/ProtocolConformance.cpp
View File

@@ -241,7 +241,7 @@ void NormalProtocolConformance::setTypeWitness(
assert(getProtocol() == cast<ProtocolDecl>(assocType->getDeclContext()) && assert(getProtocol() == cast<ProtocolDecl>(assocType->getDeclContext()) &&
"associated type in wrong protocol"); "associated type in wrong protocol");
assert(TypeWitnesses.count(assocType) == 0 && "Type witness already known"); assert(TypeWitnesses.count(assocType) == 0 && "Type witness already known");
assert(!isComplete() && "Conformance already complete?"); assert((!isComplete() || isInvalid()) && "Conformance already complete?");
TypeWitnesses[assocType] = std::make_pair(substitution, typeDecl); TypeWitnesses[assocType] = std::make_pair(substitution, typeDecl);
} }

6
lib/Sema/TypeCheckProtocol.cpp
View File

@@ -3883,6 +3883,12 @@ checkConformsToProtocol(TypeChecker &TC,
conformance->setState(ProtocolConformanceState::Checking); conformance->setState(ProtocolConformanceState::Checking);
defer { conformance->setState(ProtocolConformanceState::Complete); }; defer { conformance->setState(ProtocolConformanceState::Complete); };
// If the protocol itself is invalid, there's nothing we can do.
if (Proto->isInvalid()) {
conformance->setInvalid();
return conformance;
}
// If the protocol requires a class, non-classes are a non-starter. // If the protocol requires a class, non-classes are a non-starter.
if (Proto->requiresClass() && !canT->getClassOrBoundGenericClass()) { if (Proto->requiresClass() && !canT->getClassOrBoundGenericClass()) {
TC.diagnose(ComplainLoc, diag::non_class_cannot_conform_to_class_protocol, TC.diagnose(ComplainLoc, diag::non_class_cannot_conform_to_class_protocol,

2
validation-test/compiler_crashers/25458-swift-archetypetype-getnestedtype.swift → validation-test/compiler_crashers_fixed/25458-swift-archetypetype-getnestedtype.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/27203-swift-typeloc-iserror.swift → validation-test/compiler_crashers_fixed/27203-swift-typeloc-iserror.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/27443-matchwitness.swift → validation-test/compiler_crashers_fixed/27443-matchwitness.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/27742-matchwitness.swift → validation-test/compiler_crashers_fixed/27742-matchwitness.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)