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

Revert "Revert "[ownership] If we have an undef address, do not treat it as being owned. It is any.""

Browse Source 
This reverts commit 7a28a02189.
This commit is contained in:
Michael Gottesman
2019-06-24 11:14:34 -07:00
parent 1e3c674f56
commit 24cff27f0c
2 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/SIL/SILUndef.cpp
View File

@@ -16,6 +16,15 @@
using namespace swift;
static ValueOwnershipKind getOwnershipKindForUndef(SILType type, const SILFunction &f) {
if (type.isAddress()) {
// If we have an address only type and we are supposed to use
// lowered addresses, return Owned. Otherwise addresses are any.
if (type.isAddressOnly(f) && f.getConventions().useLoweredAddresses()) {
return ValueOwnershipKind::Owned;
}
return ValueOwnershipKind::Any;
}
if (type.isTrivial(f))
return ValueOwnershipKind::Any;
return ValueOwnershipKind::Owned;

60
test/SIL/ownership-verifier/undef.sil Normal file
View File

@@ -0,0 +1,60 @@
// RUN: %target-sil-opt -enable-objc-interop -enable-sil-verify-all=0 -module-name Swift -ownership-dumper -o /dev/null %s | %FileCheck %s
// REQUIRES: asserts
sil_stage raw
import Builtin
class Klass {}
struct MyInt {
var i: Builtin.Int32
}
// Make sure that we handle undef in an appropriate way. Do to special handling
// in SIL around undef, we test this using the ownership dumper for simplicity.
// CHECK-LABEL: *** Dumping Function: 'undef_addresses_have_any_ownership'
// CHECK: Visiting: {{.*}}%0 = mark_uninitialized [var] undef : $*Klass
// CHECK-NEXT: Operand Ownership Map:
// CHECK-NEXT: Op #: 0
// CHECK-NEXT: Ownership Map: -- OperandOwnershipKindMap --
// CHECK-NEXT: unowned: Yes. Liveness: MustBeLive
// CHECK-NEXT: owned: Yes. Liveness: MustBeLive
// CHECK-NEXT: guaranteed: Yes. Liveness: MustBeLive
// CHECK-NEXT: any: Yes. Liveness: MustBeLive
// CHECK: Visiting: {{.*}}%1 = mark_uninitialized [var] undef : $Klass
// CHECK-NEXT: Operand Ownership Map:
// CHECK-NEXT: Op #: 0
// CHECK-NEXT: Ownership Map: -- OperandOwnershipKindMap --
// CHECK-NEXT: unowned: No.
// CHECK-NEXT: owned: Yes. Liveness: MustBeInvalidated
// CHECK-NEXT: guaranteed: No.
// CHECK-NEXT: any: Yes. Liveness: MustBeLive
// CHECK: Visiting: {{.*}}%3 = mark_uninitialized [var] undef : $*Builtin.Int32
// CHECK-NEXT: Operand Ownership Map:
// CHECK-NEXT: Op #: 0
// CHECK-NEXT: Ownership Map: -- OperandOwnershipKindMap --
// CHECK-NEXT: unowned: Yes. Liveness: MustBeLive
// CHECK-NEXT: owned: Yes. Liveness: MustBeLive
// CHECK-NEXT: guaranteed: Yes. Liveness: MustBeLive
// CHECK-NEXT: any: Yes. Liveness: MustBeLive
// CHECK: Visiting: {{.*}}%4 = struct $MyInt (undef : $Builtin.Int32)
// CHECK-NEXT: Operand Ownership Map:
// CHECK-NEXT: Op #: 0
// CHECK-NEXT: Ownership Map: -- OperandOwnershipKindMap --
// CHECK-NEXT: unowned: Yes. Liveness: MustBeLive
// CHECK-NEXT: owned: Yes. Liveness: MustBeLive
// CHECK-NEXT: guaranteed: Yes. Liveness: MustBeLive
// CHECK-NEXT: any: Yes. Liveness: MustBeLive
sil [ossa] @undef_addresses_have_any_ownership : $@convention(thin) () -> () {
bb0:
%0 = mark_uninitialized [var] undef : $*Klass
%1 = mark_uninitialized [var] undef : $Klass
destroy_value %1 : $Klass
%2 = mark_uninitialized [var] undef : $*Builtin.Int32
%3 = struct $MyInt(undef : $Builtin.Int32)
%9999 = tuple()
return %9999 : $()
}