Merge pull request #30299 from gottesmm/pr-59c23cc931f2998f402e6f70662ccf3f70922c3b

[temp-rvalueopt] Teach how to promote fix_lifetime.

Author: gottesmm

lib/SILOptimizer/Transforms/TempRValueElimination.cpp

@@ -272,7 +272,11 @@ bool TempRValueOptPass::collectLoads(
       return false;
     loadInsts.insert(user);
     return true;
-
+  case SILInstructionKind::FixLifetimeInst:
+    // If we have a fixed lifetime on our alloc_stack, we can just treat it like
+    // a load and re-write it so that it is on the old memory or old src object.
+    loadInsts.insert(user);
+    return true;
   case SILInstructionKind::CopyAddrInst: {
     // copy_addr which read from the temporary are like loads.
     auto *copyFromTmp = cast<CopyAddrInst>(user);
@@ -639,6 +643,13 @@ TempRValueOptPass::tryOptimizeStoreIntoTemp(StoreInst *si) {
       toDelete.push_back(li);
       break;
     }
+    case SILInstructionKind::FixLifetimeInst: {
+      auto *fli = cast<FixLifetimeInst>(user);
+      SILBuilderWithScope builder(fli);
+      builder.createFixLifetime(fli->getLoc(), si->getSrc());
+      toDelete.push_back(fli);
+      break;
+    }
 
     // ASSUMPTION: no operations that may be handled by this default clause can
     // destroy tempObj. This includes operations that load the value from memory

test/SILOptimizer/temp_rvalue_opt.sil

@@ -655,3 +655,19 @@ bb0(%0 : $*Builtin.NativeObject):
   %v = tuple ()
   return %v : $()
 }
+
+// CHECK-LABEL: sil @eliminate_fix_lifetime_on_dest_copyaddr : $@convention(thin) (@inout Klass) -> () {
+// CHECK-NOT: alloc_stack
+// CHECK: fix_lifetime %0
+// CHECK-NOT: alloc_stack
+// CHECK: } // end sil function 'eliminate_fix_lifetime_on_dest_copyaddr'
+sil @eliminate_fix_lifetime_on_dest_copyaddr : $@convention(thin) (@inout Klass) -> () {
+bb0(%0 : $*Klass):
+  %3 = alloc_stack $Klass
+  copy_addr %0 to [initialization] %3 : $*Klass
+  fix_lifetime %3 : $*Klass
+  destroy_addr %3 : $*Klass
+  dealloc_stack %3 : $*Klass
+  %9999 = tuple()
+  return %9999 : $()
+}

test/SILOptimizer/temp_rvalue_opt_ossa.sil

@@ -1124,3 +1124,38 @@ bb0(%0 : $*Optional<GS<Klass>>, %1 : @owned $Optional<GS<Klass>>):
   %9999 = tuple()
   return %9999 : $()
 }
+
+// CHECK-LABEL: sil [ossa] @eliminate_fix_lifetime_on_dest_copyaddr : $@convention(thin) (@inout Klass) -> () {
+// CHECK-NOT: alloc_stack
+// CHECK: fix_lifetime %0
+// CHECK-NOT: alloc_stack
+// CHECK: } // end sil function 'eliminate_fix_lifetime_on_dest_copyaddr'
+sil [ossa] @eliminate_fix_lifetime_on_dest_copyaddr : $@convention(thin) (@inout Klass) -> () {
+bb0(%0 : $*Klass):
+  %3 = alloc_stack $Klass
+  copy_addr %0 to [initialization] %3 : $*Klass
+  fix_lifetime %3 : $*Klass
+  destroy_addr %3 : $*Klass
+  dealloc_stack %3 : $*Klass
+  %9999 = tuple()
+  return %9999 : $()
+}
+
+// CHECK-LABEL: sil [ossa] @eliminate_fix_lifetime_on_dest_store : $@convention(thin) (@inout Klass) -> () {
+// CHECK-NOT: alloc_stack
+// CHECK:  [[VALUE:%.*]] = load [copy] %0
+// CHECK-NEXT: fix_lifetime [[VALUE]]
+// CHECK-NEXT: destroy_value [[VALUE]]
+// CHECK-NOT: alloc_stack
+// CHECK: } // end sil function 'eliminate_fix_lifetime_on_dest_store'
+sil [ossa] @eliminate_fix_lifetime_on_dest_store : $@convention(thin) (@inout Klass) -> () {
+bb0(%0 : $*Klass):
+  %2 = load [copy] %0 : $*Klass
+  %3 = alloc_stack $Klass
+  store %2 to [init] %3 : $*Klass
+  fix_lifetime %3 : $*Klass
+  destroy_addr %3 : $*Klass
+  dealloc_stack %3 : $*Klass
+  %9999 = tuple()
+  return %9999 : $()
+}