Skip to content

Fix borrow canonicalization bugs #38875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 16, 2021
Merged

Fix borrow canonicalization bugs #38875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87a7d22
Clear internal data structures after canonicalizing function args
meg-gupta Aug 13, 2021
883d145
Handle nil BorrowedValue during canonicalization
meg-gupta Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/swift/SILOptimizer/Utils/CanonicalizeBorrowScope.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class CanonicalizeBorrowScope {

protected:
void initBorrow(BorrowedValue borrow) {
assert(liveness.empty() && persistentCopies.empty());
assert(borrow && liveness.empty() && persistentCopies.empty());

updatedCopies.clear();
borrowedValue = borrow;
Expand Down
8 changes: 7 additions & 1 deletion lib/SILOptimizer/Utils/CanonicalizeBorrowScope.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 36 additions & 0 deletions test/SILOptimizer/sil_combine_ossa.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 : $()
}