GlobalPropertyOpt: handle load_borrow and destroy_addr

Author: eeckstein

lib/SILOptimizer/IPO/GlobalPropertyOpt.cpp

@@ -219,9 +219,11 @@ bool GlobalPropertyOpt::canAddressEscape(SILValue V, bool acceptStore) {
 
     // These instructions do not cause the address to escape.
     if (isa<LoadInst>(User) ||
+        isa<LoadBorrowInst>(User) ||
         isa<DebugValueInst>(User) ||
         isa<StrongReleaseInst>(User) ||
         isa<StrongRetainInst>(User) ||
+        isa<DestroyAddrInst>(User) ||
         isa<DeallocBoxInst>(User) ||
         isa<DeallocStackInst>(User))
       continue;
@@ -285,10 +287,11 @@ void GlobalPropertyOpt::scanInstruction(swift::SILInstruction *Inst) {
       default:
         break;
     }
-  } else if (auto *LI = dyn_cast<LoadInst>(Inst)) {
+  } else if (isa<LoadInst>(Inst) || isa<LoadBorrowInst>(Inst)) {
+    auto *LI = cast<SingleValueInstruction>(Inst);
     if (isArrayType(LI->getType())) {
       // Add a dependency from the value at the address to the loaded value.
-      SILValue loadAddr = LI->getOperand();
+      SILValue loadAddr = LI->getOperand(0);
       assert(loadAddr->getType().isAddress());
       addDependency(getAddrEntry(loadAddr), getValueEntry(LI));
       return;

test/SILOptimizer/global_property_opt.sil

@@ -33,7 +33,7 @@ struct DepStruct {
   private var depField2: [X]
 }
 
-// CHECK-LABEL: sil @test_alloc_stack
+// CHECK-LABEL: sil @test_alloc_stack :
 // CHECK: [[I:%[0-9]+]] = integer_literal $Builtin.Int1, -1
 // CHECK: [[R:%[0-9]+]] = struct $Bool ([[I]] : $Builtin.Int1)
 // CHECK: return [[R]]
@@ -54,7 +54,30 @@ bb0:
   return %10 : $Bool
 }
 
-// CHECK-LABEL: sil @test_alloc_stack_escapes
+// CHECK-LABEL: sil [ossa] @test_alloc_stack_ossa :
+// CHECK: [[I:%[0-9]+]] = integer_literal $Builtin.Int1, -1
+// CHECK: [[R:%[0-9]+]] = struct $Bool ([[I]] : $Builtin.Int1)
+// CHECK: return [[R]]
+sil [ossa] @test_alloc_stack_ossa : $@convention(thin) () -> Bool {
+bb0:
+  %1 = alloc_stack $Array<X>
+  %3 = function_ref @_array_X_init : $@convention(thin) () -> @owned Array<X>
+  %4 = apply %3() : $@convention(thin) () -> @owned Array<X>
+  store %4 to [init] %1 : $*Array<X>
+
+  %m1 = function_ref @_array_X_mutate : $@convention(method) (@inout Array<X>) -> ()
+  %m2 = apply %m1(%1) : $@convention(method) (@inout Array<X>) -> ()
+
+  %5 = load_borrow %1 : $*Array<X>
+  %6 = function_ref @_is_native_X_no_type_check : $@convention(method) (@guaranteed Array<X>) -> Bool
+  %10 = apply %6(%5) : $@convention(method) (@guaranteed Array<X>) -> Bool
+  end_borrow %5
+  destroy_addr %1
+  dealloc_stack %1 : $*Array<X>
+  return %10 : $Bool
+}
+
+// CHECK-LABEL: sil @test_alloc_stack_escapes :
 // CHECK: [[F:%[0-9]+]] = function_ref @_is_native_X_no_type_check
 // CHECK: [[R:%[0-9]+]] = apply [[F]]
 // CHECK: return [[R]]
@@ -75,6 +98,29 @@ bb0:
   return %10 : $Bool
 }
 
+// CHECK-LABEL: sil [ossa] @test_alloc_stack_escapes_ossa :
+// CHECK: [[F:%[0-9]+]] = function_ref @_is_native_X_no_type_check
+// CHECK: [[R:%[0-9]+]] = apply [[F]]
+// CHECK: return [[R]]
+sil [ossa] @test_alloc_stack_escapes_ossa : $@convention(thin) () -> Bool {
+bb0:
+  %1 = alloc_stack $Array<X>
+  %3 = function_ref @_array_X_init : $@convention(thin) () -> @owned Array<X>
+  %4 = apply %3() : $@convention(thin) () -> @owned Array<X>
+  store %4 to [init] %1 : $*Array<X>
+
+  %m1 = function_ref @_take_array_addr : $@convention(method) (@inout Array<X>) -> ()
+  %m2 = apply %m1(%1) : $@convention(method) (@inout Array<X>) -> ()
+
+  %5 = load_borrow %1 : $*Array<X>
+  %6 = function_ref @_is_native_X_no_type_check : $@convention(method) (@guaranteed Array<X>) -> Bool
+  %10 = apply %6(%5) : $@convention(method) (@guaranteed Array<X>) -> Bool
+  end_borrow %5
+  destroy_addr %1
+  dealloc_stack %1 : $*Array<X>
+  return %10 : $Bool
+}
+
 // CHECK-LABEL: sil @test_alloc_write_unknown
 // CHECK: [[F:%[0-9]+]] = function_ref @_is_native_X_no_type_check
 // CHECK: [[R:%[0-9]+]] = apply [[F]]