---

yaml
---
r: 348539
b: refs/heads/master
c: 5e5c5b1
h: refs/heads/master
i:
  348537: 389ec26
  348535: 3f631f6

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0291bbfed63409fe258a4b55641f1e40d9c7f918
+refs/heads/master: 5e5c5b153d860f899d5bdeb5365a9335ce838543
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/CSGen.cpp

@@ -2478,11 +2478,11 @@ namespace {
     }
 
     Type visitDefaultArgumentExpr(DefaultArgumentExpr *expr) {
-      llvm_unreachable("Already type checked");
+      return expr->getType();
     }
 
     Type visitCallerDefaultArgumentExpr(CallerDefaultArgumentExpr *expr) {
-      llvm_unreachable("Already type checked");
+      return expr->getType();
     }
 
     Type visitApplyExpr(ApplyExpr *expr) {

trunk/lib/Sema/ConstraintSystem.cpp

@@ -2880,6 +2880,9 @@ ConstraintSystem::getArgumentInfoLocator(ConstraintLocator *locator) {
 
 Optional<ConstraintSystem::ArgumentInfo>
 ConstraintSystem::getArgumentInfo(ConstraintLocator *locator) {
+  if (!locator)
+    return None;
+
   if (auto *infoLocator = getArgumentInfoLocator(locator)) {
     auto known = ArgumentInfos.find(infoLocator);
     if (known != ArgumentInfos.end())

trunk/lib/Sema/TypeCheckCaptures.cpp

@@ -645,6 +645,12 @@ void TypeChecker::computeCaptures(AnyFunctionRef AFR) {
   }
 }
 
+static bool isLazy(PatternBindingDecl *PBD) {
+  if (auto var = PBD->getSingleVar())
+    return var->getAttrs().hasAttribute<LazyAttr>();
+  return false;
+}
+
 void TypeChecker::checkPatternBindingCaptures(NominalTypeDecl *typeDecl) {
   auto &ctx = typeDecl->getASTContext();
 
@@ -669,7 +675,7 @@ void TypeChecker::checkPatternBindingCaptures(NominalTypeDecl *typeDecl) {
                               /*ObjC=*/false);
       init->walk(finder);
 
-      if (finder.getDynamicSelfCaptureLoc().isValid()) {
+      if (finder.getDynamicSelfCaptureLoc().isValid() && !isLazy(PBD)) {
         ctx.Diags.diagnose(finder.getDynamicSelfCaptureLoc(),
                            diag::dynamic_self_stored_property_init);
       }

trunk/test/type/self.swift

@@ -253,4 +253,13 @@ class SelfStoredPropertyInit {
   static func myValue() -> Int { return 123 }
 
   var value = Self.myValue() // expected-error {{covariant 'Self' type cannot be referenced from a stored property initializer}}
-}
+}
+
+// rdar://problem/55273931 - erroneously rejecting 'Self' in lazy initializer
+class Foo {
+  static var value: Int = 17
+
+  lazy var doubledValue: Int = {
+    Self.value * 2
+  }()
+}

trunk/validation-test/compiler_crashers_2_fixed/rdar54609704.swift

@@ -0,0 +1,34 @@
+// RUN: %target-swift-frontend -c %s
+
+@propertyWrapper
+class OneOf<Value: Equatable> {
+  var wrappedValue: Value {
+    get { value }
+    set { storeIfAllowed(newValue) }
+  }
+  
+  private var value: Value
+  
+  private let allowedValues: [Value]
+  
+  init(wrappedValue value: Value, _ allowedValues: Value...) {
+    precondition(allowedValues.contains(value))
+    self.value = value
+    self.allowedValues = allowedValues
+  }
+  
+  private func storeIfAllowed(_ value: Value) {
+    guard allowedValues.contains(value) else {
+      return
+    }
+    
+    self.value = value
+  }
+}
+
+struct Test {
+  @OneOf(4, 8, 15, 16, 23, 42) private var numbers: Int = 4
+}
+func test() {
+  _ = Test()
+}