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

SIL: fix Builder.emitDestroy(of:)

Browse Source 
Do nothing for values with address types.

Fixes a crash in ConstantCapturePropagation
rdar://160816390
This commit is contained in:
Erik Eckstein
2025-09-23 10:50:26 +02:00
parent 90a5a0f87d
commit 935e5ecd7a
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SwiftCompilerSources/Sources/SIL/Builder.swift
View File

@@ -767,6 +767,9 @@ extension Builder {
if value.type.isTrivial(in: value.parentFunction) { if value.type.isTrivial(in: value.parentFunction) {
return return
} }
if value.type.isAddress {
return
}
if value.parentFunction.hasOwnership { if value.parentFunction.hasOwnership {
createDestroyValue(operand: value) createDestroyValue(operand: value)
} else if value.type.isClass { } else if value.type.isClass {

34
test/SILOptimizer/capture_propagation.sil
View File

@@ -803,7 +803,7 @@ struct S {
} }
// CHECK-LABEL: sil [ossa] @testStruct : // CHECK-LABEL: sil [ossa] @testStruct :
// CHECK: [[C]] = function_ref @$s17closureWithStruct4main1SVs5Int32VSbTf3npSSi3Si0_n : $@convention(thin) (Str) -> Builtin.Int32 // CHECK: [[C:%.*]] = function_ref @$s17closureWithStruct4main1SVs5Int32VSbTf3npSSi3Si0_n : $@convention(thin) (Str) -> Builtin.Int32
// CHECK: thin_to_thick_function [[C]] : $@convention(thin) (Str) -> Builtin.Int32 to $@callee_guaranteed (Str) -> Builtin.Int32 // CHECK: thin_to_thick_function [[C]] : $@convention(thin) (Str) -> Builtin.Int32 to $@callee_guaranteed (Str) -> Builtin.Int32
// CHECK: } // end sil function 'testStruct' // CHECK: } // end sil function 'testStruct'
sil [ossa] @testStruct : $@convention(thin) () -> () { sil [ossa] @testStruct : $@convention(thin) () -> () {
@@ -843,3 +843,35 @@ bb0(%0 : $Str, %1 : $S):
} }
sil @swift_getAtKeyPath : $@convention(thin) <τ_0_0, τ_0_1> (@in_guaranteed τ_0_0, @guaranteed KeyPath<τ_0_0, τ_0_1>) -> @out τ_0_1 sil @swift_getAtKeyPath : $@convention(thin) <τ_0_0, τ_0_1> (@in_guaranteed τ_0_0, @guaranteed KeyPath<τ_0_0, τ_0_1>) -> @out τ_0_1
struct NonTrivialStruct {
var x: AnyObject
}
sil_global [serialized] @gNonTrivialStruct : $NonTrivialStruct
// CHECK-LABEL: sil [ossa] @test_global_addr :
// CHECK: [[C:%.*]] = function_ref @$s19global_addr_closure17gNonTrivialStructTf3pg_n : $@convention(thin) () -> ()
// CHECK: thin_to_thick_function %2 : $@convention(thin) () -> () to $@callee_owned () -> ()
// CHECK: } // end sil function 'test_global_addr'
sil [ossa] @test_global_addr : $@convention(thin) () -> () {
%3 = global_addr @gNonTrivialStruct : $*NonTrivialStruct
%7 = function_ref @global_addr_closure : $@convention(thin) <T> (@in_guaranteed T) -> ()
%8 = partial_apply %7<NonTrivialStruct>(%3) : $@convention(thin) <T> (@in_guaranteed T) -> ()
destroy_value %8
%r = tuple()
return %r
}
// CHECK-LABEL: sil shared [ossa] @$s19global_addr_closure17gNonTrivialStructTf3pg_n :
// CHECK: bb0:
// CHECK-NEXT: %0 = global_addr @gNonTrivialStruct : $*NonTrivialStruct
// CHECK-NEXT: %1 = tuple ()
// CHECK-NEXT: return %1
// CHECK: } // end sil function '$s19global_addr_closure17gNonTrivialStructTf3pg_n'
sil [ossa] @global_addr_closure : $@convention(thin) <T> (@in_guaranteed T) -> () {
bb0(%0 : $*T):
%r = tuple()
return %r : $()
}