Merge pull request #910 from jtbandes/invalid-proto

slavapestov · slavapestov · commit 8b57337ca6ef · 2016-01-09T23:27:41.000-08:00
[Sema] Improve handling of invalid protocols during conformance checking
diff --git a/lib/AST/ProtocolConformance.cpp b/lib/AST/ProtocolConformance.cpp
@@ -261,7 +261,7 @@ void NormalProtocolConformance::setTypeWitness(
   assert(getProtocol() == cast<ProtocolDecl>(assocType->getDeclContext()) &&
          "associated type in wrong protocol");
   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);
 }
 
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -3881,6 +3881,12 @@ checkConformsToProtocol(TypeChecker &TC,
   conformance->setState(ProtocolConformanceState::Checking);
   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 (Proto->requiresClass() && !canT->getClassOrBoundGenericClass()) {
     TC.diagnose(ComplainLoc, diag::non_class_cannot_conform_to_class_protocol,
diff --git a/validation-test/compiler_crashers_fixed/25458-swift-archetypetype-getnestedtype.swift b/validation-test/compiler_crashers_fixed/25458-swift-archetypetype-getnestedtype.swift
@@ -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
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)
diff --git a/validation-test/compiler_crashers_fixed/27203-swift-typeloc-iserror.swift b/validation-test/compiler_crashers_fixed/27203-swift-typeloc-iserror.swift
@@ -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
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)
diff --git a/validation-test/compiler_crashers_fixed/27443-matchwitness.swift b/validation-test/compiler_crashers_fixed/27443-matchwitness.swift
@@ -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
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)
diff --git a/validation-test/compiler_crashers_fixed/27742-matchwitness.swift b/validation-test/compiler_crashers_fixed/27742-matchwitness.swift
@@ -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
 // Test case submitted to project by https://github.com/practicalswift (practicalswift)

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ void NormalProtocolConformance::setTypeWitness(`
`261`	`261`	`assert(getProtocol() == cast<ProtocolDecl>(assocType->getDeclContext()) &&`
`262`	`262`	`"associated type in wrong protocol");`
`263`	`263`	`assert(TypeWitnesses.count(assocType) == 0 && "Type witness already known");`
`264`		`- assert(!isComplete() && "Conformance already complete?");`
	`264`	`+ assert((!isComplete() \|\| isInvalid()) && "Conformance already complete?");`
`265`	`265`	`TypeWitnesses[assocType] = std::make_pair(substitution, typeDecl);`
`266`	`266`	`}`
`267`	`267`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: not --crash %target-swift-frontend %s -parse`
	`1`	`+// RUN: not %target-swift-frontend %s -parse`
`2`	`2`
`3`	`3`	`// Distributed under the terms of the MIT license`
`4`	`4`	`// Test case submitted to project by https://github.com/practicalswift (practicalswift)`