Merge pull request #26099 from gmittert/ATrueOrdering

Sort `DeclAttributeAndRange`s Deterministically

Author: gmittert

lib/IDE/SyntaxModel.cpp

@@ -1080,10 +1080,13 @@ bool ModelASTWalker::handleAttrRanges(ArrayRef<DeclAttributeAndRange> DeclRanges
 
   SmallVector<DeclAttributeAndRange, 4> SortedRanges(DeclRanges.begin(),
                                                      DeclRanges.end());
-  std::sort(SortedRanges.begin(), SortedRanges.end(),
-            [&](DeclAttributeAndRange LHS, DeclAttributeAndRange RHS) {
-    return SM.isBeforeInBuffer(LHS.second.Start, RHS.second.End);
-  });
+  std::sort(
+      SortedRanges.begin(), SortedRanges.end(),
+      [&](DeclAttributeAndRange LHS, DeclAttributeAndRange RHS) {
+        // Since attributes don't overlap it's safe to compare just by the
+        // range's Start
+        return SM.isBeforeInBuffer(LHS.second.Start, RHS.second.Start);
+      });
   // Handle duplicate synthesized attributes due to * in @available
   auto NewEnd = std::unique(SortedRanges.begin(), SortedRanges.end(),
                             [&](DeclAttributeAndRange LHS, DeclAttributeAndRange RHS) {