averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40741 from eeckstein/fix-alloc-stack-hoisting

Browse Source 
AllocStackHoisting: fix the check for availability-checks
This commit is contained in:
eeckstein
2022-01-06 05:05:25 +01:00
committed by GitHub
parent 7386444664 0bd35418fa
commit fdda6f2ee4
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/IRGen/AllocStackHoisting.cpp
View File

@@ -348,14 +348,12 @@ private:
} // end anonymous namespace } // end anonymous namespace
bool indicatesDynamicAvailabilityCheckUse(SILInstruction *I) { bool indicatesDynamicAvailabilityCheckUse(SILInstruction *I) {
auto *Apply = dyn_cast<ApplyInst>(I); if (auto *Apply = dyn_cast<ApplyInst>(I)) {
if (!Apply) return Apply->hasSemantics(semantics::AVAILABILITY_OSVERSION);
return false; }
if (Apply->hasSemantics(semantics::AVAILABILITY_OSVERSION)) if (auto *bi = dyn_cast<BuiltinInst>(I)) {
return true; return bi->getBuiltinInfo().ID == BuiltinValueKind::TargetOSVersionAtLeast;
auto *FunRef = Apply->getReferencedFunctionOrNull(); }
if (!FunRef)
return false;
return false; return false;
} }

27
test/SILOptimizer/allocstack_hoisting.sil
View File

@@ -230,3 +230,30 @@ bb3:
%3 = builtin "int_trap"() : $() %3 = builtin "int_trap"() : $()
unreachable unreachable
} }
// CHECK-LABEL: sil @dont_hoist_with_availability_checks
// CHECK-NOT: alloc_stack
// CHECK: cond_br
// CHECK: bb1:
// CHECK: alloc_stack
// CHECK: } // end sil function 'dont_hoist_with_availability_checks'
sil @dont_hoist_with_availability_checks : $@convention(thin) <T> (@in T, Builtin.Int1) -> () {
bb0(%0 : $*T, %1: $Builtin.Int1):
%5 = integer_literal $Builtin.Int32, 15
%7 = builtin "targetOSVersionAtLeast"(%5 : $Builtin.Int32, %5 : $Builtin.Int32, %5 : $Builtin.Int32) : $Builtin.Int32
%8 = builtin "cmp_eq_Int32"(%7 : $Builtin.Int32, %5 : $Builtin.Int32) : $Builtin.Int1
cond_br %8, bb1, bb2
bb1:
%2 = alloc_stack $T
copy_addr [take] %0 to [initialization] %2 : $*T
destroy_addr %2 : $*T
dealloc_stack %2 : $*T
br bb3
bb2:
destroy_addr %0 : $*T
br bb3
bb3:
%3 = tuple ()
return %3 : $()
}