Merge pull request #38271 from eeckstein/fix-di-closure-handling

DefiniteInitialization: correctly handle implicit closures in initializers of derived classes.

Author: eeckstein

lib/SILOptimizer/Mandatory/DIMemoryUseCollector.cpp

@@ -1065,7 +1065,11 @@ void ElementUseCollector::collectClassSelfUses(SILValue ClassPointer) {
 
   // If we are looking at the init method for a root class, just walk the
   // MUI use-def chain directly to find our uses.
-  if (TheMemory.isRootSelf()) {
+  if (TheMemory.isRootSelf() ||
+  
+      // Also, just visit all users if ClassPointer is a closure argument,
+      // i.e. collectClassSelfUses is called from addClosureElementUses.
+      isa<SILFunctionArgument>(ClassPointer)) {
     collectClassSelfUses(ClassPointer, TheMemory.getType(), EltNumbering);
     return;
   }

test/SILOptimizer/definite_init_closures.swift

@@ -69,4 +69,15 @@ struct Generic<T : P> {
   }
 }
 
+class Base { }
+
+class Derived : Base {
+  var x: Bool
+  var y: Bool
+
+  init(_: Int) {
+    x = false
+    y = true || x
+  }
+}