Skip to content

[ASTScope] Use the end location of the original source range of a macro expansion in isBeforeInSource. #70576

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 21, 2023
Merged

[ASTScope] Use the end location of the original source range of a macro expansion in isBeforeInSource. #70576

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
4 changes: 2 additions & 2 deletions lib/Basic/SourceLoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,11 +797,11 @@ static bool isBeforeInSource(
SourceLoc firstLocInLCA = firstMismatch == firstAncestors.end()
? firstLoc
: sourceMgr.getGeneratedSourceInfo(*firstMismatch)
->originalSourceRange.getStart();
->originalSourceRange.getEnd();
SourceLoc secondLocInLCA = secondMismatch == secondAncestors.end()
? secondLoc
: sourceMgr.getGeneratedSourceInfo(*secondMismatch)
->originalSourceRange.getStart();
->originalSourceRange.getEnd();
return sourceMgr.isBeforeInBuffer(firstLocInLCA, secondLocInLCA) ||
(allowEqual && firstLocInLCA == secondLocInLCA);
}
Expand Down
10 changes: 10 additions & 0 deletions test/stdlib/Observation/Observable.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,16 @@ class RecursiveOuter {
class GuardedAvailability {
}

@Observable class TestASTScopeLCA {
// Make sure ASTScope unqualified lookup can find local variables
// inside initial values with closures when accessor macros are
// involved.
var state : Bool = {
let value = true
return value
}()
}

@main
struct Validator {
@MainActor
Expand Down