Merge pull request #62312 from jckarter/mix-read-or-address-with-setter-reabstraction

SILGen: Match up abstraction level when materializing mixed set and read/unsafeAddress properties.

Author: jckarter

lib/SILGen/SILGenApply.cpp

@@ -3256,7 +3256,7 @@ class ArgEmitter {
         return SGF.emitLValue(e->getSubExpr(), SGFAccessKind::ReadWrite);
       }
     }();
-
+    
     if (loweredSubstParamType.hasAbstractionDifference(Rep,
                                                        loweredSubstArgType)) {
       lv.addSubstToOrigComponent(origType, loweredSubstParamType);

lib/SILGen/SILGenLValue.cpp

@@ -1871,7 +1871,7 @@ namespace {
     }
 
     void dump(raw_ostream &OS, unsigned indent) const override {
-      OS.indent(indent) << "MaterializeToTemporaryComponent";
+      OS.indent(indent) << "MaterializeToTemporaryComponent\n";
     }
 
   private:
@@ -1905,6 +1905,10 @@ namespace {
                                       /*actorIsolation=*/None);
         }
       }
+      
+      if (lv.getTypeOfRValue() != getTypeOfRValue()) {
+        lv.addOrigToSubstComponent(getTypeOfRValue());
+      }
 
       return lv;
     }
@@ -3500,6 +3504,7 @@ struct MemberStorageAccessEmitter : AccessEmitter<Impl, StorageType> {
                                BaseFormalType, typeData, varStorageType,
                                ArgListForDiagnostics, std::move(Indices),
                                IsOnSelfParameter);
+    
   }
 
   void emitUsingCoroutineAccessor(SILDeclRef accessor, bool isDirect,

test/SILGen/mix-setter-and-read.swift

@@ -0,0 +1,26 @@
+// RUN: %target-swift-emit-silgen -verify %s
+
+struct Attributt<T> {
+    public var read_and_set: T {
+        _read {
+            yield UnsafePointer<T>(bitPattern: 17)!.pointee
+        }
+        nonmutating set {
+        }
+    }
+    public var address_and_set: T {
+        unsafeAddress {
+            return UnsafePointer<T>(bitPattern: 38)!
+        }
+        nonmutating set {
+        }
+    }
+}
+
+func foo(x: inout (Int) -> Int) { }
+
+func bar(x: Attributt<(Int) -> Int>) {
+    foo(x: &x.read_and_set)
+    foo(x: &x.address_and_set)
+}
+