Treat 'var's with init accessors as mutable in initializers

DougGregor · DougGregor · commit 62558b00b803 · 2024-06-04T22:46:50.000-07:00
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -7404,6 +7404,11 @@ VarDecl::mutability(const DeclContext *UseDC,
   if (!isLet()) {
     if (hasInitAccessor()) {
       if (auto *ctor = dyn_cast_or_null<ConstructorDecl>(UseDC)) {
+        // If we're referencing 'self.', it's mutable.
+        if (!base ||
+            (*base && ctor->getImplicitSelfDecl() == (*base)->getDecl()))
+          return StorageMutability::Mutable;
+
         return storageIsMutable(supportsMutation());
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -7404,6 +7404,11 @@ VarDecl::mutability(const DeclContext *UseDC,`
`7404`	`7404`	`if (!isLet()) {`
`7405`	`7405`	`if (hasInitAccessor()) {`
`7406`	`7406`	`if (auto *ctor = dyn_cast_or_null<ConstructorDecl>(UseDC)) {`
	`7407`	`+ // If we're referencing 'self.', it's mutable.`
	`7408`	`+ if (!base \|\|`
	`7409`	`+ (base && ctor->getImplicitSelfDecl() == (base)->getDecl()))`
	`7410`	`+ return StorageMutability::Mutable;`
	`7411`	`+`
`7407`	`7412`	`return storageIsMutable(supportsMutation());`
`7408`	`7413`	`}`
`7409`	`7414`	`}`