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

Merge remote-tracking branch 'origin/main' into rebranch

Browse Source
This commit is contained in:
swift-ci
2021-08-16 11:33:58 -07:00
parent 29b09d54b1 5d6659cd6c
commit a0e5b00d9a
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h
View File

@@ -136,7 +136,7 @@ public:
protected:
void initBorrow(BorrowedValue borrow) {
assert(liveness.empty() && persistentCopies.empty());
assert(borrow && liveness.empty() && persistentCopies.empty());
updatedCopies.clear();
borrowedValue = borrow;

8
lib/SILOptimizer/Utils/CanonicalizeBorrowScope.cpp
View File

@@ -778,9 +778,15 @@ bool CanonicalizeBorrowScope::consolidateBorrowScope() {
bool CanonicalizeBorrowScope::canonicalizeFunctionArgument(
SILFunctionArgument *arg) {
BorrowedValue borrow(arg);
if (!borrow)
return false;
initBorrow(borrow);
LLVM_DEBUG(llvm::dbgs() << "*** Canonicalize Borrow: " << borrowedValue);
initBorrow(BorrowedValue(arg));
SWIFT_DEFER { liveness.clear(); };
RewriteInnerBorrowUses innerRewriter(*this);
beginVisitBorrowScopeUses(); // reset the def/use worklist

36
test/SILOptimizer/sil_combine_ossa.sil
View File

@@ -1,5 +1,6 @@
// RUN: %target-sil-opt -enable-objc-interop -enforce-exclusivity=none -enable-sil-verify-all %s -sil-combine | %FileCheck %s
// RUN: %target-sil-opt -enable-objc-interop -enforce-exclusivity=none -enable-sil-verify-all %s -sil-combine -generic-specializer | %FileCheck %s --check-prefix=CHECK_FORWARDING_OWNERSHIP_KIND
// RUN: %target-sil-opt -enable-objc-interop -enforce-exclusivity=none -enable-sil-verify-all %s -sil-combine -enable-copy-propagation
// Declare this SIL to be canonical because some tests break raw SIL
// conventions. e.g. address-type block args. -enforce-exclusivity=none is also
@@ -5087,3 +5088,38 @@ bb0(%0 : @guaranteed $Function):
destroy_value %6 : $Optional<@callee_guaranteed (MyInt) -> Double>
return %13 : $Double
}
sil [reabstraction_thunk] @thunk : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> ()
// CHECK-LABEL: sil [ossa] @test_partial_apply_apply_opt1 :
// CHECK-NOT: partial_apply
// CHECK: } // end sil function 'test_partial_apply_apply_opt1'
sil [ossa] @test_partial_apply_apply_opt1 : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> () {
bb0(%0 : @guaranteed $Klass, %1 : @guaranteed $Klass):
%c1 = copy_value %0 : $Klass
%c2 = copy_value %1 : $Klass
%f1 = function_ref @thunk : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> ()
%p1 = partial_apply [callee_guaranteed] %f1(%c1, %c2) : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> ()
%r = apply %p1() : $@callee_guaranteed () -> ()
destroy_value %p1 : $@callee_guaranteed () -> ()
%7 = tuple ()
return %7 : $()
}
// CHECK-LABEL: sil [ossa] @test_partial_apply_apply_opt2 :
// CHECK-NOT: partial_apply
// CHECK: } // end sil function 'test_partial_apply_apply_opt2'
sil [ossa] @test_partial_apply_apply_opt2 : $@convention(thin) (@owned Klass, @owned Klass) -> () {
bb0(%0 : @owned $Klass, %1 : @owned $Klass):
%c1 = copy_value %0 : $Klass
%c2 = copy_value %1 : $Klass
%f1 = function_ref @thunk : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> ()
%p1 = partial_apply [callee_guaranteed] %f1(%c1, %c2) : $@convention(thin) (@guaranteed Klass, @guaranteed Klass) -> ()
%r = apply %p1() : $@callee_guaranteed () -> ()
destroy_value %p1 : $@callee_guaranteed () -> ()
destroy_value %0 : $Klass
destroy_value %1 : $Klass
%7 = tuple ()
return %7 : $()
}