Merge pull request #17866 from DougGregor/forward-reference-local-type

Author: swift-ci

lib/Sema/TypeCheckConstraints.cpp

@@ -601,10 +601,14 @@ resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE, DeclContext *DC) {
   auto isValid = [&](ValueDecl *D) {
     // FIXME: The source-location checks won't make sense once
     // EnableASTScopeLookup is the default.
+    //
+    // Note that we allow forward references to types, because they cannot
+    // capture.
     if (Loc.isValid() && D->getLoc().isValid() &&
         D->getDeclContext()->isLocalContext() &&
         D->getDeclContext() == DC &&
-        Context.SourceMgr.isBeforeInBuffer(Loc, D->getLoc())) {
+        Context.SourceMgr.isBeforeInBuffer(Loc, D->getLoc()) &&
+        !isa<TypeDecl>(D)) {
       localDeclAfterUse = D;
       return false;
     }

test/Compatibility/local_types.swift

@@ -0,0 +1,7 @@
+// RUN: %target-typecheck-verify-swift
+
+func foo() {
+  // Okay to reference a type declared later in the same function.
+  _ = Visitor()
+  struct Visitor { }
+}