Merge pull request #8857 from rjmccall/weaken-redelay-assertion

Author: swift-ci

lib/Sema/TypeChecker.cpp

@@ -578,10 +578,14 @@ static void typeCheckFunctionsAndExternalDecls(TypeChecker &TC) {
   // Now that all types have been finalized, run any delayed
   // circularity checks.
   // This has been written carefully to fail safe + finitely if
-  // for some reason a type gets re-delayed.
+  // for some reason a type gets re-delayed in a non-assertions
+  // build in an otherwise successful build.
+  // Types can be redelayed in a failing build because we won't
+  // type-check required declarations from different files.
   for (size_t i = 0, e = TC.DelayedCircularityChecks.size(); i != e; ++i) {
     TC.checkDeclCircularity(TC.DelayedCircularityChecks[i]);
-    assert(e == TC.DelayedCircularityChecks.size() &&
+    assert((e == TC.DelayedCircularityChecks.size() ||
+            TC.Context.hadError()) &&
            "circularity checking for type was re-delayed!");
   }
   TC.DelayedCircularityChecks.clear();

test/Sema/Inputs/circularity_multifile_error_helper.swift

@@ -0,0 +1,5 @@
+struct External {
+  var member: Something
+}
+
+struct OtherExternal {}

test/Sema/circularity_multifile_error.swift

@@ -0,0 +1,11 @@
+// RUN: %target-swift-frontend -emit-silgen -verify -primary-file %s %S/Inputs/circularity_multifile_error_helper.swift
+
+// SR-4594
+
+struct A {
+  var b: AnUndefinedType // expected-error {{use of undeclared type 'AnUndefinedType'}}
+}
+
+struct B {
+  var a : External
+}