Merge pull request #30610 from eeckstein/fix-destroy-hoisting

DestroyHoisting: fix a bug which creates invalid SIL

Author: eeckstein

lib/SILOptimizer/Transforms/DestroyHoisting.cpp

@@ -549,15 +549,17 @@ SILValue DestroyHoisting::createAddress(unsigned locIdx, SILBuilder &builder) {
   assert(!isa<BeginAccessInst>(loc->representativeValue) &&
          "only a root location can be a begin_access");
 
-  SingleValueInstruction *&cachedProj = addressProjections[locIdx];
-  if (cachedProj)
-    return cachedProj;
-
   if (!domTree)
     domTree = DA->get(function);
+    
+  SILInstruction *ip = &*builder.getInsertionPoint();
+
+  SingleValueInstruction *&cachedProj = addressProjections[locIdx];
+  if (cachedProj && domTree->properlyDominates(cachedProj, ip))
+    return cachedProj;
 
   auto *projInst = cast<SingleValueInstruction>(loc->representativeValue);
-  if (domTree->properlyDominates(projInst, &*builder.getInsertionPoint())) {
+  if (domTree->properlyDominates(projInst, ip)) {
     cachedProj = projInst;
     return projInst;
   }
@@ -580,7 +582,7 @@ SILValue DestroyHoisting::createAddress(unsigned locIdx, SILBuilder &builder) {
     newProj = projBuilder.createTupleElementAddr(TEA->getLoc(), baseAddr,
                                             TEA->getFieldNo(), TEA->getType());
   }
-  assert(domTree->properlyDominates(newProj, &*builder.getInsertionPoint()) &&
+  assert(domTree->properlyDominates(newProj, ip) &&
          "new projection does not dominate insert point");
   // We need to remember the new projection instruction because in tailMerging
   // we might call locations.getLocationIdx() on such a new instruction.

test/SILOptimizer/destroy_hoisting_crash.swift

@@ -0,0 +1,21 @@
+// RUN: %target-swift-frontend -O %s -emit-sil -o /dev/null
+
+public struct S {
+  let args: [Substring]
+  let arg: Substring
+
+  enum Error: Swift.Error {
+    case Case
+  }
+
+  public init(arg: String) throws {
+    args = arg.split(separator: "\n")
+    guard args.count > 0 else { throw Error.Case }
+
+    let parts = args[0].split(separator: " ")
+    guard parts.count > 2 else { throw Error.Case }
+
+    self.arg = parts[1]
+  }
+}
+