Merge pull request #70576 from hborla/macro-lookup-fix

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

Author: hborla

lib/Basic/SourceLoc.cpp

@@ -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);
 }

test/stdlib/Observation/Observable.swift

@@ -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