Skip to content

[6.1] Look through forwarding instructions while querying ownership root #78614

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
Jan 21, 2025
Merged

[6.1] Look through forwarding instructions while querying ownership root #78614

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
7 changes: 7 additions & 0 deletions include/swift/SIL/MemAccessUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,13 @@ class AccessBase : public AccessRepresentation {
return findOwnershipReferenceRoot(getReference());
}

/// Return the OSSA root of the reference being accessed
/// looking through struct_extract, tuple_extract, etc.
/// Precondition: isReference() is true.
SILValue getOwnershipReferenceAggregate() const {
return findOwnershipReferenceAggregate(getReference());
}

/// Return the storage root of the reference being accessed.
///
/// Precondition: isReference() is true.
Expand Down
2 changes: 1 addition & 1 deletion lib/SIL/Utils/OwnershipUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ bool AddressOwnership::areUsesWithinLifetime(
if (!base.hasLocalOwnershipLifetime())
return true;

SILValue root = base.getOwnershipReferenceRoot();
SILValue root = base.getOwnershipReferenceAggregate();
BorrowedValue borrow(root);
if (borrow)
return borrow.areUsesWithinExtendedScope(uses, &deadEndBlocks);
Expand Down
23 changes: 23 additions & 0 deletions test/SILOptimizer/cse_ossa_nontrivial.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,3 +1010,26 @@ bb0:
return %t : $()
}

// CHECK-LABEL: sil [ossa] @test_aggreate_tail_addr :
// CHECK: ref_tail_addr
// CHECK: ref_tail_addr
// CHECK-LABEL: } // end sil function 'test_aggreate_tail_addr'
sil [ossa] @test_aggreate_tail_addr : $@convention(thin) (@owned _NativeDictionary<Int, Klass>) -> () {
bb0(%0 : @owned $_NativeDictionary<Int, Klass>):
%1 = move_value [lexical] %0 : $_NativeDictionary<Int, Klass>
%2 = begin_borrow %1 : $_NativeDictionary<Int, Klass>
%3 = struct_extract %2 : $_NativeDictionary<Int, Klass>, #_NativeDictionary._storage
%4 = copy_value %3 : $__RawDictionaryStorage
%5 = ref_tail_addr %3 : $__RawDictionaryStorage, $_UnsafeBitset.Word
%6 = load [trivial] %5 : $*_UnsafeBitset.Word
end_borrow %2 : $_NativeDictionary<Int, Klass>
%8 = begin_borrow %4 : $__RawDictionaryStorage
%9 = ref_tail_addr %8 : $__RawDictionaryStorage, $_UnsafeBitset.Word
%10 = struct_element_addr %9 : $*_UnsafeBitset.Word, #_UnsafeBitset.Word.value
%11 = struct_element_addr %10 : $*UInt, #UInt._value
%12 = load [trivial] %11 : $*Builtin.Int64
end_borrow %8 : $__RawDictionaryStorage
destroy_value %4 : $__RawDictionaryStorage
destroy_value %1 : $_NativeDictionary<Int, Klass>
unreachable
}