Move a cycle

Author: CodaFi

lib/Sema/TypeCheckStorage.cpp

@@ -39,7 +39,7 @@ void swift::setBoundVarsTypeError(Pattern *pattern, ASTContext &ctx) {
   pattern->forEachVariable([&](VarDecl *var) {
     // Don't change the type of a variable that we've been able to
     // compute a type for.
-    if (var->hasInterfaceType() && !var->getType()->hasError())
+    if (var->hasInterfaceType())
       return;
 
     var->setInterfaceType(ErrorType::get(var->getASTContext()));

test/CircularReferences/global_typealias.swift

@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift
 
-typealias A = B // expected-error {{type alias 'A' references itself}}
-typealias C = D // expected-note {{through reference here}}
-typealias D = (A, Int) // expected-note {{through reference here}}
-typealias B = C // expected-note {{through reference here}}
+typealias A = B // expected-error {{type alias 'A' references itself}} expected-note {{through reference here}}
+typealias C = D // expected-note {{through reference here}} expected-note {{through reference here}}
+typealias D = (A, Int) // expected-note {{through reference here}} expected-note {{through reference here}}
+typealias B = C // expected-note {{through reference here}} expected-note {{through reference here}}

test/NameBinding/name_lookup.swift

@@ -628,6 +628,6 @@ struct PatternBindingWithTwoVars3 { var x = y, y = x }
 
 // https://bugs.swift.org/browse/SR-9015
 func sr9015() {
-  let closure1 = { closure2() } // expected-error {{circular reference}} expected-error{{variable 'closure1' is not bound by any pattern}} expected-note {{through reference here}}
-  let closure2 = { closure1() } // expected-note {{through reference here}} expected-note {{through reference here}}
+  let closure1 = { closure2() } // expected-error {{circular reference}} expected-error{{variable 'closure1' is not bound by any pattern}} expected-note {{through reference here}} expected-note {{through reference here}}
+  let closure2 = { closure1() } // expected-note {{through reference here}} expected-note {{through reference here}} expected-note {{through reference here}}
 }

test/Sema/diag_typealias.swift

@@ -2,4 +2,4 @@
 
 struct S {}
 
-typealias S = S // expected-error {{type alias 'S' references itself}}
+typealias S = S // expected-error {{type alias 'S' references itself}} expected-note {{through reference here}}

test/decl/init/basic_init.swift

@@ -10,7 +10,7 @@ class C {
 	init() {}
 }
 
-typealias t = t // expected-error {{type alias 't' references itself}}
+typealias t = t // expected-error {{type alias 't' references itself}} expected-note {{through reference here}}
 
 extension Foo {
   convenience init() {} // expected-error{{invalid redeclaration of synthesized 'init()'}}

test/decl/var/variables.swift

@@ -71,6 +71,8 @@ let a = b ; let b = a
 // expected-note@-3 {{through reference here}}
 // expected-note@-4 {{through reference here}}
 // expected-note@-5 {{through reference here}}
+// expected-note@-6 {{through reference here}}
+// expected-note@-7 {{through reference here}}
 
 // <rdar://problem/17501765> Swift should warn about immutable default initialized values
 let uselessValue : String?