Merge pull request swiftlang#80325 from cachemeifyoucan/basedeclname-compare

cachemeifyoucan · web-flow · commit a810c722f615 · 2025-03-27T05:38:19.000-07:00
diff --git a/include/swift/AST/Identifier.h b/include/swift/AST/Identifier.h
@@ -385,7 +385,11 @@ class DeclBaseName {
   }
 
   int compare(DeclBaseName other) const {
-    return userFacingName().compare(other.userFacingName());
+    if (int result = userFacingName().compare(other.userFacingName()))
+      return result;
+    if (getKind() == other.getKind())
+      return 0;
+    return getKind() < other.getKind() ? -1 : 1;
   }
 
   bool operator==(StringRef Str) const {

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,11 @@ class DeclBaseName {`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`int compare(DeclBaseName other) const {`
`388`		`- return userFacingName().compare(other.userFacingName());`
	`388`	`+ if (int result = userFacingName().compare(other.userFacingName()))`
	`389`	`+ return result;`
	`390`	`+ if (getKind() == other.getKind())`
	`391`	`+ return 0;`
	`392`	`+ return getKind() < other.getKind() ? -1 : 1;`
`389`	`393`	`}`
`390`	`394`
`391`	`395`	`bool operator==(StringRef Str) const {`