Merge pull request swiftlang#11451 from CodaFi/in-glome-we-trust

Turn on circularity checks for ProtocolCompositions
Ajisaputrars · Aug 14, 2017 · 76f9c3e · 76f9c3e
2 parents 31943cb + f479f27
commit 76f9c3e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -2927,7 +2927,7 @@ Type TypeResolver::resolveCompositionType(CompositionTypeRepr *repr,
   };
 
   for (auto tyR : repr->getTypes()) {
-    Type ty = TC.resolveType(tyR, DC, withoutContext(options), Resolver);
+    Type ty = resolveType(tyR, withoutContext(options));
     if (!ty || ty->hasError()) return ty;
 
     auto nominalDecl = ty->getAnyNominal();

diff --git a/...ft-declname-swift-declcontext-swift.swift → ...ft-declname-swift-declcontext-swift.swift b/...ft-declname-swift-declcontext-swift.swift → ...ft-declname-swift-declcontext-swift.swift
@@ -5,6 +5,6 @@
 // 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
 class A:a:a{}typealias a:A.a
 & Ms