Merge pull request #31248 from hborla/property-wrapper-di

[Property Wrappers] Only re-write assign_by_wrapper to assignment if all fields have been initialized.

Author: hborla

lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp

@@ -1047,7 +1047,15 @@ void LifetimeChecker::handleStoreUse(unsigned UseID) {
   if (isFullyUninitialized) {
     Use.Kind = DIUseKind::Initialization;
   } else if (isFullyInitialized) {
-    Use.Kind = DIUseKind::Assign;
+    // Only re-write assign_by_wrapper to assignment if all fields have been
+    // initialized.
+    if (isa<AssignByWrapperInst>(Use.Inst) &&
+        getAnyUninitializedMemberAtInst(Use.Inst, 0,
+                                        TheMemory.getNumElements()) != -1) {
+      Use.Kind = DIUseKind::Initialization;
+    } else {
+      Use.Kind = DIUseKind::Assign;
+    }
   } else {
     // If it is initialized on some paths, but not others, then we have an
     // inconsistent initialization, which needs dynamic control logic in the

test/SILOptimizer/di_property_wrappers.swift

@@ -501,6 +501,37 @@ public final class Synchronized<Value> {
   }
 }
 
+struct SR_12341 {
+  @Wrapper var wrapped: Int = 10
+  var str: String
+
+  init() {
+     wrapped = 42
+     str = ""
+     wrapped = 27
+  }
+
+  init(condition: Bool) {
+    wrapped = 42
+    wrapped = 27
+    str = ""
+  }
+}
+
+func testSR_12341() {
+  // CHECK: ## SR_12341
+  print("\n## SR_12341")
+
+  // CHECK-NEXT:   .. init 10
+  // CHECK-NEXT:   .. init 42
+  // CHECK-NEXT:   .. set 27
+  _ = SR_12341()
+
+  // CHECK-NEXT:   .. init 10
+  // CHECK-NEXT:   .. init 42
+  // CHECK-NEXT:   .. init 27
+  _ = SR_12341(condition: true)
+}
 
 testIntStruct()
 testIntClass()
@@ -511,3 +542,4 @@ testOptIntStruct()
 testDefaultNilOptIntStruct()
 testComposed()
 testWrapperInitWithDefaultArg()
+testSR_12341()