Merge pull request #26254 from DougGregor/property-wrappers-sr11149-5.1

[5.1] [Type checker] Substitute into alternate properties when trying to fix property references

Author: DougGregor

lib/Sema/ConstraintSystem.h

@@ -2216,7 +2216,12 @@ class ConstraintSystem {
       if (auto *decl = dyn_cast<VarDecl>(resolvedOverload->Choice.getDecl())) {
         if (decl->hasAttachedPropertyWrapper()) {
           if (auto storageWrapper = decl->getPropertyWrapperStorageWrapper()) {
-            return std::make_pair(decl, storageWrapper->getType());
+            Type type = storageWrapper->getInterfaceType();
+            if (Type baseType = resolvedOverload->Choice.getBaseType()) {
+              type = baseType->getTypeOfMember(DC->getParentModule(),
+                                               storageWrapper, type);
+            }
+            return std::make_pair(decl, type);
           }
         }
       }
@@ -2233,6 +2238,10 @@ class ConstraintSystem {
       if (auto *decl = dyn_cast<VarDecl>(resolvedOverload->Choice.getDecl())) {
         if (decl->hasAttachedPropertyWrapper()) {
           auto wrapperTy = decl->getPropertyWrapperBackingPropertyType();
+          if (Type baseType = resolvedOverload->Choice.getBaseType()) {
+            wrapperTy = baseType->getTypeOfMember(DC->getParentModule(),
+                                                  decl, wrapperTy);
+          }
           return std::make_pair(decl, wrapperTy);
         }
       }
@@ -2249,7 +2258,12 @@ class ConstraintSystem {
     if (resolvedOverload->Choice.isDecl()) {
       if (auto *decl = dyn_cast<VarDecl>(resolvedOverload->Choice.getDecl())) {
         if (auto wrapped = decl->getOriginalWrappedProperty()) {
-          return std::make_pair(decl, wrapped->getType());
+          Type type = wrapped->getInterfaceType();
+          if (Type baseType = resolvedOverload->Choice.getBaseType()) {
+            type = baseType->getTypeOfMember(DC->getParentModule(),
+                                             wrapped, type);
+          }
+          return std::make_pair(decl, type);
         }
       }
     }

validation-test/compiler_crashers_2_fixed/0203-sr11149.swift

@@ -0,0 +1,37 @@
+// RUN: not %target-swift-frontend -typecheck %s
+enum S<Value> {
+  @propertyWrapper 
+  private struct A {
+    var s:UInt = 0
+    var wrappedValue:Value { didSet { } }
+  
+    init(wrappedValue:Value) { self.wrappedValue = wrappedValue }
+  }
+    
+  @propertyWrapper 
+  final class B {
+    @A 
+    var wrappedValue:Value 
+    
+    var projectedValue:S<Value>.B  
+    {
+      self
+    }
+    
+    init(wrappedValue:Value) 
+    {
+      self.wrappedValue = wrappedValue
+    }
+  }
+    
+  @propertyWrapper 
+  struct O {
+    private  var s:UInt? = nil 
+    @B private(set) var wrappedValue:Value 
+    
+    var a:Bool 
+    {
+      self.s.map{ $0 != self.$wrappedValue.wrappedValue.sequence } ?? true
+    }
+  }
+}