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

Fix SILGenFunction::emitBasicProlog for @lifetime with default args.

Browse Source 
LifetimeDependencies were being read from the wrong DeclContext.

Fixes rdar://142451893 (Crash during AST -> SIL lowering)
This commit is contained in:
Andrew Trick
2025-01-09 22:14:37 -08:00
parent 635ea34bb5
commit 03ae24daa9
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/SILGen/SILGenProlog.cpp
View File

@@ -1643,9 +1643,12 @@ uint16_t SILGenFunction::emitBasicProlog(
emitIndirectErrorParameter(*this, *errorType, *origErrorType, DC);
}
// Parameters with scoped dependencies may lower differently.
// Parameters with scoped dependencies may lower differently. Parameters are
// relative to the current SILGenFunction, not the passed in DeclContext. For
// example, the an argument initializer's DeclContext is the enclosing
// function definition rather that the initializer's generator function.
llvm::SmallPtrSet<ParamDecl *, 2> scopedDependencyParams;
if (auto afd = dyn_cast<AbstractFunctionDecl>(DC)) {
if (auto afd = dyn_cast<AbstractFunctionDecl>(FunctionDC)) {
if (auto deps = afd->getLifetimeDependencies()) {
for (auto &dep : *deps) {
auto scoped = dep.getScopeIndices();

10
test/SILGen/addressable_for_dependencies.swift
View File

@@ -9,7 +9,7 @@ struct Foo { var x: String }
struct Bar { var foo: Foo }
struct Dep: ~Escapable {
var x: Int
var x: Int = 0
@lifetime(immortal)
init() { }
@@ -98,3 +98,11 @@ extension Bar {
return bar.dependencyOnSelf()
}
}
// CHECK-LABEL: sil {{.*}}@$s28addressable_for_dependencies14defaulArgument1iySi_tFfA_ :
// CHECK-SAME: $@convention(thin) () -> Int {
// CHECK-LABEL: sil {{.*}}@$s28addressable_for_dependencies14defaulArgument1iySi_tF :
// CHECK-SAME: $@convention(thin) (Int) -> @lifetime(borrow 0) () {
@lifetime(borrow i)
func defaulArgument(i: Int = 0) {}