DI: Use new 'self initialized' analysis in LifetimeChecker::handleStoreUse()

Author: slavapestov

lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp

@@ -973,13 +973,6 @@ void LifetimeChecker::emitSelfConsumedDiagnostic(SILInstruction *Inst) {
 void LifetimeChecker::handleStoreUse(unsigned UseID) {
   DIMemoryUse &InstInfo = Uses[UseID];
 
-  if (TheMemory.isAnyInitSelf()) {
-    if (getSelfConsumedAtInst(InstInfo.Inst) != DIKind::No) {
-      emitSelfConsumedDiagnostic(InstInfo.Inst);
-      return;
-    }
-  }
-
   // Determine the liveness state of the element that we care about.
   auto Liveness = getLivenessAtInst(InstInfo.Inst, InstInfo.FirstElement,
                                     InstInfo.NumElements);
@@ -997,6 +990,17 @@ void LifetimeChecker::handleStoreUse(unsigned UseID) {
       isFullyUninitialized = false;
   }
 
+  if (TheMemory.isNonRootClassSelf()) {
+    if (getSelfInitializedAtInst(InstInfo.Inst) != DIKind::Yes) {
+      auto SelfLiveness = getLivenessAtInst(InstInfo.Inst,
+                                            0, TheMemory.NumElements);
+      if (SelfLiveness.isAllYes()) {
+        emitSelfConsumedDiagnostic(InstInfo.Inst);
+        return;
+      }
+    }
+  }
+
   // If this is a partial store into a struct and the whole struct hasn't been
   // initialized, diagnose this as an error.
   if (InstInfo.Kind == DIUseKind::PartialStore && !isFullyInitialized) {

test/SILOptimizer/definite_init_diagnostics.swift

@@ -1230,3 +1230,20 @@ class SuperConvenienceSub : SuperConvenienceBase {
     self.init(i1, i1)
   }
 }
+
+// While testing some changes I found this regression that wasn't
+// covered by any existing tests
+class Base {}
+
+func makeAnAny() -> Any { return 3 }
+
+class Derived : Base {
+  var x: Int?
+  var y: Int?
+
+  override init() {
+    x = makeAnAny() as? Int
+    y = makeAnAny() as? Int
+    super.init()
+  }
+}