Skip to content

[DebugInfo][SILGen] Ensure "guard let" is lowered with a non-implicit location #70111

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
Dec 1, 2023
Merged

[DebugInfo][SILGen] Ensure "guard let" is lowered with a non-implicit location #70111

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
2 changes: 1 addition & 1 deletion lib/SILGen/SILGenExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ void SILGenFunction::emitExprInto(Expr *E, Initialization *I,
FormalEvaluationScope writeback(*this);
auto lv = emitLValue(load->getSubExpr(),
SGFAccessKind::BorrowedAddressRead);
emitCopyLValueInto(E, std::move(lv), I);
emitCopyLValueInto(L ? *L : E, std::move(lv), I);
return;
}

Expand Down
17 changes: 17 additions & 0 deletions test/SILGen/guardlet_debuginfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// RUN: %target-swift-emit-silgen -g -Xllvm -sil-print-debuginfo %s | %FileCheck %s

class A {
func foo() {
{ [weak self] in
// Check that column 14 -- the start "guard" -- is used as the debug location,
// as other locations are considered implicit.
// CHECK: switch_enum
// CHECK-SAME: guardlet_debuginfo.swift":[[@LINE+1]]:13
guard let self else { return }
print(self)
}()
}
}

let a = A()
a.foo()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@adrian-prantl if you have a suggestion for a better test, please let me know