Merge pull request #26239 from DougGregor/property-wrappers-rdar52679284

Author: swift-ci

lib/Sema/TypeCheckDecl.cpp

@@ -2441,6 +2441,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     (void) VD->isGetterMutating();
     (void) VD->isSetterMutating();
 
+    // Retrieve the backing property of a wrapped property.
+    (void) VD->getPropertyWrapperBackingProperty();
+
     // Set up accessors, also lowering lazy and @NSManaged properties.
     maybeAddAccessorsToStorage(VD);
 
@@ -5341,7 +5344,6 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
     }
 
   } else {
-    SmallPtrSet<VarDecl *, 4> backingStorageVars;
     for (auto member : decl->getMembers()) {
       if (auto ctor = dyn_cast<ConstructorDecl>(member)) {
         // Initializers that were synthesized to fulfill derived conformances
@@ -5364,17 +5366,9 @@ void TypeChecker::addImplicitConstructors(NominalTypeDecl *decl) {
       }
 
       if (auto var = dyn_cast<VarDecl>(member)) {
-        // If this variable has a property wrapper, go validate it to ensure
-        // that we create the backing storage property.
-        if (auto backingVar = var->getPropertyWrapperBackingProperty()) {
-          validateDecl(var);
-          maybeAddAccessorsToStorage(var);
-
-          backingStorageVars.insert(backingVar);
-        }
-
-        // Ignore the backing storage for properties with attached wrappers.
-        if (backingStorageVars.count(var) > 0)
+        // If this is a backing storage property for a property wrapper,
+        // skip it.
+        if (var->getOriginalWrappedProperty())
           continue;
 
         if (var->isMemberwiseInitialized(/*preferDeclaredProperties=*/true)) {

test/decl/protocol/conforms/redundant_conformance.swift

@@ -65,3 +65,24 @@ extension OtherGenericConditionalConformsToP: P1 {
     typealias A = Double
     func f() -> Double { return 0.0 }
 }
+
+// FB6114209: spurious ambiguity errors
+protocol MyUsefulProtocol {
+  var someInt: Int { get }
+}
+
+class Class1 {
+  typealias ProviderOne = MyUsefulProtocol
+}
+
+class Class2 {
+  typealias ProviderTwo = MyUsefulProtocol
+}
+
+class Class3 {
+  typealias ProviderThree = Class1.ProviderOne & Class2.ProviderTwo
+}
+
+class SomeMockClass: Class3.ProviderThree { // okay
+  var someInt: Int = 5
+}

validation-test/compiler_crashers_2_fixed/0199-rdar52679284.swift

@@ -0,0 +1,14 @@
+// RUN: %target-swift-frontend -typecheck %s -verify
+
+public protocol MyBindableObject {}
+
+@propertyWrapper
+public struct MyBinding<T> where T : MyBindableObject { // expected-error{{internal initializer 'init(wrappedValue:)' cannot have more restrictive access than its enclosing property wrapper type 'MyBinding' (which is public)}}
+    public var wrappedValue: T
+}
+class BeaconDetector: MyBindableObject {
+    @MyBinding var detector = BeaconDetector()
+    init() {
+        detector.undefined = 45 // expected-error{{value of type 'BeaconDetector' has no member 'undefined'}}
+    }
+}