Skip to content

Commit 53b67ec

Browse files
committed
---
yaml --- r: 326257 b: refs/heads/master-next c: 321d9b7 h: refs/heads/master i: 326255: 496ac0a
1 parent 296ff6b commit 53b67ec

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: e052da7d8886fa0439677852e8f7830b20c2e1da
3-
refs/heads/master-next: 2df956a4cad5bc86f468a482daa76c26cb3d5e48
3+
refs/heads/master-next: 321d9b76e7922fd0397cec2bc10e018b7d2cd385
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Sema/ConstraintSystem.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -498,16 +498,6 @@ Type ConstraintSystem::openUnboundGenericType(UnboundGenericType *unbound,
498498
ConstraintLocatorBuilder locator,
499499
OpenedTypeMap &replacements) {
500500
auto unboundDecl = unbound->getDecl();
501-
502-
// If the unbound decl hasn't been validated yet, we have a circular
503-
// dependency that isn't being diagnosed properly.
504-
//
505-
// FIXME: Delete this condition. He's dead Jim.
506-
if (!unboundDecl->hasComputedGenericSignature()) {
507-
TC.diagnose(unboundDecl, diag::circular_reference);
508-
return Type();
509-
}
510-
511501
auto parentTy = unbound->getParent();
512502
if (parentTy) {
513503
parentTy = openUnboundGenericType(parentTy, locator);

0 commit comments

Comments
 (0)