---

yaml
---
r: 348715
b: refs/heads/master
c: 88ecae4
h: refs/heads/master
i:
  348713: c72e264
  348711: d80c897

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 534781ef8c565932fe6988a77d6c6a42bf5c7a95
+refs/heads/master: 88ecae4b9a4a6bb8ae7ffcd389221708da50ac25
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/TypeCheckCaptures.cpp

@@ -365,6 +365,11 @@ class FindCapturedVars : public ASTWalker {
       return false;
     }
 
+    // Don't walk into local types; we'll walk their initializers when we check
+    // the local type itself.
+    if (isa<NominalTypeDecl>(D))
+      return false;
+
     return true;
   }
 

trunk/test/SILGen/Inputs/lazy_properties_other.swift

@@ -0,0 +1,14 @@
+public class C2 {
+  public final func f() {
+    func local() {
+      _ = {
+        class Local {
+          lazy var a = {
+            return b
+          }()
+          var b = 123
+        }
+      }
+    }
+  }
+}

trunk/test/SILGen/lazy_properties_multi.swift

@@ -0,0 +1,14 @@
+// RUN: %target-swift-emit-silgen -primary-file %s %S/Inputs/lazy_properties_other.swift -module-name lazy_properties_multi | %FileCheck %s
+// RUN: %target-swift-emit-silgen %S/Inputs/lazy_properties_other.swift -primary-file %s -module-name lazy_properties_multi | %FileCheck %s
+// RUN: %target-swift-emit-silgen %S/Inputs/lazy_properties_other.swift %s -module-name lazy_properties_multi | %FileCheck %s
+// RUN: %target-swift-emit-silgen %s %S/Inputs/lazy_properties_other.swift -module-name lazy_properties_multi | %FileCheck %s
+
+
+public class C1 {
+  // CHECK-LABEL: sil [ossa] @$s21lazy_properties_multi2C1C1f1cyAA2C2C_tF : $@convention(method) (@guaranteed C2, @guaranteed C1) -> () {
+  // CHECK: [[FN:%.*]] = function_ref @$s21lazy_properties_multi2C2C1fyyF : $@convention(method) (@guaranteed C2)
+  // CHECK: apply [[FN]](%0) : $@convention(method) (@guaranteed C2) -> ()
+  public func f(c: C2) {
+    c.f()
+  }
+}