---

yaml
---
r: 343797
b: refs/heads/master-rebranch
c: 5664045
h: refs/heads/master
i:
  343795: 5122f51

Author: nkcsgexi

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 78bb298389d3557b0740510b6ad4575379c1f550
+refs/heads/master-rebranch: 5664045d01ceae4645c2b4d33f8c5384816ce991
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/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) {

branches/master-rebranch/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())

branches/master-rebranch/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);
       }

branches/master-rebranch/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
+  }()
+}

branches/master-rebranch/tools/libSwiftSyntaxParser/CMakeLists.txt

@@ -47,8 +47,7 @@ if(SWIFT_NEED_EXPLICIT_LIBDISPATCH)
 endif()
 
 add_dependencies(parser-lib libSwiftSyntaxParser)
-swift_install_in_component(FILES "${SWIFT_LIBRARY_OUTPUT_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${SYNTAX_PARSER_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
-                           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+swift_install_in_component(PROGRAMS "${SWIFT_LIBRARY_OUTPUT_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${SYNTAX_PARSER_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
                            DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}"
                            COMPONENT parser-lib)
 swift_install_in_component(DIRECTORY "${SWIFT_MAIN_INCLUDE_DIR}/swift-c/SyntaxParser/"

branches/master-rebranch/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()
+}