Merge pull request #20796 from rjmccall/lazy-property-is-mutating-5.0

Mark lazy properties as having mutating getters immediately.

Author: AnnaZaks

lib/Sema/CodeSynthesis.cpp

@@ -189,12 +189,6 @@ static AccessorDecl *createGetterPrototype(TypeChecker &TC,
   ParamDecl *selfDecl = nullptr;
   if (storage->getDeclContext()->isTypeContext()) {
     if (storage->getAttrs().hasAttribute<LazyAttr>()) {
-      // The getter is considered mutating if it's on a value type.
-      if (!storage->getDeclContext()->getSelfClassDecl() &&
-          !storage->isStatic()) {
-        storage->setIsGetterMutating(true);
-      }
-
       // For lazy properties, steal the 'self' from the initializer context.
       auto *varDecl = cast<VarDecl>(storage);
       auto *bindingDecl = varDecl->getParentPatternBinding();

lib/Sema/TypeCheckDecl.cpp

@@ -2282,6 +2282,15 @@ static bool validateAccessorIsMutating(TypeChecker &TC, FuncDecl *accessor) {
 
 static bool computeIsGetterMutating(TypeChecker &TC,
                                     AbstractStorageDecl *storage) {
+  // 'lazy' overrides the normal accessor-based rules and heavily
+  // restricts what accessors can be used.  The getter is considered
+  // mutating if this is instance storage on a value type.
+  if (storage->getAttrs().hasAttribute<LazyAttr>()) {
+    return storage->getDeclContext()->isTypeContext() &&
+           !storage->getDeclContext()->getSelfClassDecl() &&
+           !storage->isStatic();
+  }
+
   switch (storage->getReadImpl()) {
   case ReadImplKind::Stored:
     return false;

test/multifile/Inputs/external_lazy_property.swift

@@ -0,0 +1,3 @@
+public struct Test1 {
+    lazy var property: String = "help"
+}

test/multifile/lazy.swift

@@ -0,0 +1,6 @@
+// RUN: %target-swift-frontend -emit-sil -verify -primary-file %s %S/Inputs/external_lazy_property.swift
+
+// rdar://45712204
+func test1(s: Test1) {
+  s.property // expected-error {{cannot use mutating getter on immutable value: 's' is a 'let' constant}}
+}