Skip to content

Use AccessPath exact use visitor in LoadBorrowImmutabilityChecker #61549

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 1 commit into from
Oct 13, 2022
Merged

Use AccessPath exact use visitor in LoadBorrowImmutabilityChecker #61549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions lib/SIL/Verifier/LoadBorrowImmutabilityChecker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class GatherWritesVisitor : public AccessUseVisitor {

public:
GatherWritesVisitor(SmallVectorImpl<Operand *> &writes)
: AccessUseVisitor(AccessUseType::Overlapping,
: AccessUseVisitor(AccessUseType::Exact,
NestedAccessType::StopAtAccessBegin),
writeAccumulator(writes) {}

Expand Down Expand Up @@ -339,12 +339,6 @@ bool LoadBorrowImmutabilityAnalysis::isImmutableInScope(
if (deadEndBlocks.isDeadEnd(write->getParent())) {
continue;
}
// A destroy_value will be a definite write only when the destroy is on the
// ownershipRoot
if (isa<DestroyValueInst>(write)) {
if (op->get() != ownershipRoot)
continue;
}

if (borrowLiveness.isWithinBoundary(write)) {
llvm::errs() << "Write: " << *write;
Expand Down
52 changes: 43 additions & 9 deletions test/SIL/OwnershipVerifier/load_borrow_invalidation_test.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ bb0(%0 : @owned $Builtin.NativeObject):
return %9999 : $()
}

class ComplexStruct {
class KlassWithStruct {
var val : NonTrivialStruct
}

Expand All @@ -440,17 +440,51 @@ struct NonTrivialStruct {
var val : Klass
}

sil [ossa] @test_borrow : $@convention(thin) (@owned ComplexStruct) -> () {
bb0(%0 : @owned $ComplexStruct):
%2 = copy_value %0 : $ComplexStruct
%4 = begin_borrow %2 : $ComplexStruct
%5 = ref_element_addr %4 : $ComplexStruct, #ComplexStruct.val
sil [ossa] @test_borrow : $@convention(thin) (@owned KlassWithStruct) -> () {
bb0(%0 : @owned $KlassWithStruct):
%2 = copy_value %0 : $KlassWithStruct
%4 = begin_borrow %2 : $KlassWithStruct
%5 = ref_element_addr %4 : $KlassWithStruct, #KlassWithStruct.val
%6 = load_borrow %5 : $*NonTrivialStruct
destroy_value %0 : $ComplexStruct
destroy_value %0 : $KlassWithStruct
end_borrow %6 : $NonTrivialStruct
end_borrow %4 : $ComplexStruct
destroy_value %2 : $ComplexStruct
end_borrow %4 : $KlassWithStruct
destroy_value %2 : $KlassWithStruct
%ret = tuple ()
return %ret : $()
}

sil [ossa] @test_overlapping_write1 : $@convention(method) (@guaranteed KlassWithStruct) -> () {
bb0(%0 : @guaranteed $KlassWithStruct):
%2 = copy_value %0 : $KlassWithStruct
%5 = ref_element_addr %0 : $KlassWithStruct, #KlassWithStruct.val
%6 = begin_access [read] [dynamic] %5 : $*NonTrivialStruct
%7 = load_borrow %6 : $*NonTrivialStruct
%11 = alloc_stack $KlassWithStruct
store %2 to [init] %11 : $*KlassWithStruct
destroy_addr %11 : $*KlassWithStruct
dealloc_stack %11 : $*KlassWithStruct
end_borrow %7 : $NonTrivialStruct
end_access %6 : $*NonTrivialStruct
%t = tuple ()
return %t : $()
}

sil [ossa] @test_overlapping_write2 : $@convention(method) (@guaranteed KlassWithStruct) -> () {
bb0(%0 : @guaranteed $KlassWithStruct):
%2 = copy_value %0 : $KlassWithStruct
%3 = begin_borrow %2 : $KlassWithStruct
%5 = ref_element_addr %3 : $KlassWithStruct, #KlassWithStruct.val
%6 = begin_access [read] [dynamic] %5 : $*NonTrivialStruct
%7 = load_borrow %6 : $*NonTrivialStruct
%11 = alloc_stack $KlassWithStruct
%12 = store_borrow %0 to %11 : $*KlassWithStruct
end_borrow %12 : $*KlassWithStruct
dealloc_stack %11 : $*KlassWithStruct
end_borrow %7 : $NonTrivialStruct
end_access %6 : $*NonTrivialStruct
end_borrow %3 : $KlassWithStruct
destroy_value %2 : $KlassWithStruct
%t = tuple ()
return %t : $()
}