Merge pull request #26006 from DougGregor/property-wrapper-di-resilience

Author: swift-ci

lib/SIL/SILVerifier.cpp

@@ -1967,13 +1967,9 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
             "assign instruction can only exist in raw SIL");
     require(Dest->getType().isAddress(), "Must store to an address dest");
 
-    unsigned indirectInitResults = Src->getType().isAddress() ? 1 : 0;
-
     SILValue initFn = AI->getInitializer();
     CanSILFunctionType initTy = initFn->getType().castTo<SILFunctionType>();
     SILFunctionConventions initConv(initTy, AI->getModule());
-    require(initConv.getNumIndirectSILResults() == indirectInitResults,
-            "init function has wrong number of indirect results");
     unsigned firstArgIdx = initConv.getSILArgIndexOfFirstParam();
     require(initConv.getNumSILArguments() == firstArgIdx + 1,
             "init function has wrong number of arguments");

test/SILGen/Inputs/property_wrapper_defs.swift

@@ -0,0 +1,18 @@
+@propertyWrapper
+public struct MyPublished<Value> {
+	private var stored: Value
+	
+	public var wrappedValue: Value {
+		get { stored }
+		set { stored = newValue }
+	}		
+
+	public init(initialValue: Value) {
+		stored = initialValue
+	}
+
+	public var projectedValue: Self {
+		mutating get { self }
+		set { self = newValue }
+	}
+}

test/SILGen/property_wrappers.swift

@@ -1,5 +1,7 @@
-// RUN: %target-swift-frontend -primary-file %s -emit-silgen | %FileCheck %s
-// FIXME: switch to %target-swift-emit-silgen once we have syntax tree support
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-frontend -emit-module -o %t -enable-library-evolution %S/Inputs/property_wrapper_defs.swift
+// RUN: %target-swift-emit-silgen -primary-file %s -I %t | %FileCheck %s
+import property_wrapper_defs
 
 @propertyWrapper
 struct Wrapper<T> {
@@ -408,6 +410,20 @@ struct WithTuples {
 	}
 }
 
+// Resilience with DI of wrapperValue assignments.
+// rdar://problem/52467175
+class TestResilientDI {
+  @MyPublished var data: Int? = nil
+
+	// CHECK: assign_by_wrapper {{%.*}} : $Optional<Int> to {{%.*}} : $*MyPublished<Optional<Int>>, init {{%.*}} : $@callee_guaranteed (Optional<Int>) -> @out MyPublished<Optional<Int>>, set {{%.*}} : $@callee_guaranteed (Optional<Int>) -> ()
+
+  func doSomething() {
+    self.data = Int()
+  }
+}
+
+
+
 // CHECK-LABEL: sil_vtable ClassUsingWrapper {
 // CHECK-NEXT:  #ClassUsingWrapper.x!getter.1: (ClassUsingWrapper) -> () -> Int : @$s17property_wrappers17ClassUsingWrapperC1xSivg   // ClassUsingWrapper.x.getter
 // CHECK-NEXT:  #ClassUsingWrapper.x!setter.1: (ClassUsingWrapper) -> (Int) -> () : @$s17property_wrappers17ClassUsingWrapperC1xSivs // ClassUsingWrapper.x.setter