Merge pull request #31054 from hborla/roop-buildStorageReference_lvalue

[Property Wrappers] Fix computation of lvalue-ness in buildStorageReference

Author: hborla

include/swift/AST/ASTTypeIDZone.def

@@ -47,6 +47,8 @@ SWIFT_TYPEID_NAMED(NamedPattern *, NamedPattern)
 SWIFT_TYPEID_NAMED(NominalTypeDecl *, NominalTypeDecl)
 SWIFT_TYPEID_NAMED(OpaqueTypeDecl *, OpaqueTypeDecl)
 SWIFT_TYPEID_NAMED(OperatorDecl *, OperatorDecl)
+SWIFT_TYPEID_NAMED(Optional<PropertyWrapperLValueness>,
+                   PropertyWrapperLValueness)
 SWIFT_TYPEID_NAMED(Optional<PropertyWrapperMutability>,
                    PropertyWrapperMutability)
 SWIFT_TYPEID_NAMED(ParamDecl *, ParamDecl)

include/swift/AST/ASTTypeIDs.h

@@ -49,6 +49,7 @@ class PrefixOperatorDecl;
 struct PropertyWrapperBackingPropertyInfo;
 struct PropertyWrapperTypeInfo;
 enum class CtorInitializerKind;
+struct PropertyWrapperLValueness;
 struct PropertyWrapperMutability;
 class ProtocolDecl;
 class Requirement;

include/swift/AST/PropertyWrappers.h

@@ -127,6 +127,23 @@ struct PropertyWrapperMutability {
 
 void simple_display(llvm::raw_ostream &os, PropertyWrapperMutability m);
 
+/// Describes whether the reference to a property wrapper instance used for
+/// accessing a wrapped property should be an l-value or not.
+struct PropertyWrapperLValueness {
+  llvm::SmallVector<bool, 4> isLValueForGetAccess;
+  llvm::SmallVector<bool, 4> isLValueForSetAccess;
+
+  PropertyWrapperLValueness(unsigned numWrappers)
+      : isLValueForGetAccess(numWrappers), isLValueForSetAccess(numWrappers) {}
+
+  bool operator==(PropertyWrapperLValueness other) const {
+    return (isLValueForGetAccess == other.isLValueForGetAccess &&
+            isLValueForSetAccess == other.isLValueForSetAccess);
+  }
+};
+
+void simple_display(llvm::raw_ostream &os, PropertyWrapperLValueness l);
+
 /// Describes the backing property of a property that has an attached wrapper.
 struct PropertyWrapperBackingPropertyInfo {
   /// The backing property.

include/swift/AST/TypeCheckRequests.h

@@ -41,6 +41,7 @@ class ClosureExpr;
 class GenericParamList;
 class PrecedenceGroupDecl;
 struct PropertyWrapperBackingPropertyInfo;
+struct PropertyWrapperLValueness;
 struct PropertyWrapperMutability;
 class RequirementRepr;
 class SpecializeAttr;
@@ -632,6 +633,26 @@ class PropertyWrapperMutabilityRequest :
   bool isCached() const;
 };
 
+/// Request information about the l-valueness of composed property wrappers.
+class PropertyWrapperLValuenessRequest :
+    public SimpleRequest<PropertyWrapperLValuenessRequest,
+                         Optional<PropertyWrapperLValueness> (VarDecl *),
+                         RequestFlags::Cached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+private:
+  friend SimpleRequest;
+
+  // Evaluation.
+  Optional<PropertyWrapperLValueness>
+  evaluate(Evaluator &evaluator, VarDecl *var) const;
+
+public:
+  // Caching
+  bool isCached() const;
+};
+
 /// Request information about the backing property for properties that have
 /// attached property wrappers.
 class PropertyWrapperBackingPropertyInfoRequest :

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -150,6 +150,9 @@ SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyInfoRequest,
               NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, PropertyWrapperBackingPropertyTypeRequest,
               Type(VarDecl *), Cached, NoLocationInfo)
+SWIFT_REQUEST(TypeChecker, PropertyWrapperLValuenessRequest,
+              Optional<PropertyWrapperLValueness>(VarDecl *), Cached,
+              NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, PropertyWrapperMutabilityRequest,
               Optional<PropertyWrapperMutability>(VarDecl *), Cached,
               NoLocationInfo)

lib/AST/TypeCheckRequests.cpp

@@ -573,6 +573,11 @@ bool PropertyWrapperMutabilityRequest::isCached() const {
   return !var->getAttrs().isEmpty();
 }
 
+bool PropertyWrapperLValuenessRequest::isCached() const {
+  auto var = std::get<0>(getStorage());
+  return !var->getAttrs().isEmpty();
+}
+
 void swift::simple_display(
     llvm::raw_ostream &out, const PropertyWrapperTypeInfo &propertyWrapper) {
   out << "{ ";
@@ -615,6 +620,14 @@ void swift::simple_display(llvm::raw_ostream &os, PropertyWrapperMutability m) {
   os << "getter " << names[m.Getter] << ", setter " << names[m.Setter];
 }
 
+void swift::simple_display(llvm::raw_ostream &out, PropertyWrapperLValueness l) {
+  out << "is lvalue for get: {";
+  simple_display(out, l.isLValueForGetAccess);
+  out << "}, is lvalue for set: {";
+  simple_display(out, l.isLValueForSetAccess);
+  out << "}";
+}
+
 void swift::simple_display(llvm::raw_ostream &out,
                            ResilienceExpansion value) {
   switch (value) {