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

Author: slavapestov

lib/SILOptimizer/Mandatory/DefiniteInitialization.cpp

@@ -1697,13 +1697,9 @@ void LifetimeChecker::handleSelfInitUse(DIMemoryUse &InstInfo) {
   auto *Inst = InstInfo.Inst;
 
   assert(TheMemory.isAnyInitSelf());
+  assert(!TheMemory.isClassInitSelf() || TheMemory.isNonRootClassSelf());
   assert(TheMemory.getType()->hasReferenceSemantics());
 
-  if (getSelfConsumedAtInst(Inst) != DIKind::No) {
-    emitSelfConsumedDiagnostic(Inst);
-    return;
-  }
-
   // Determine the liveness states of the memory object, including the
   // self/super.init state.
   AvailabilitySet Liveness = getLivenessAtInst(Inst, 0, TheMemory.NumElements);
@@ -1716,6 +1712,11 @@ void LifetimeChecker::handleSelfInitUse(DIMemoryUse &InstInfo) {
   case DIKind::Yes:
   case DIKind::Partial:
     // This is bad, only one super.init call is allowed.
+    if (getSelfInitializedAtInst(Inst) != DIKind::Yes) {
+      emitSelfConsumedDiagnostic(Inst);
+      return;
+    }
+
     if (shouldEmitError(Inst))
       diagnose(Module, Inst->getLoc(), diag::selfinit_multiple_times,
                TheMemory.isDelegatingInit());