Fix a bug in the lexicographically order of functions in the callee set.

This fixes a bug that was introduced in 95b2fa869bf3208c8e52558a008b1c3d02bee706.
swiftlang · Nov 23, 2015 · 693f6af · 693f6af
1 parent d78c4db
commit 693f6af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/SILAnalysis/BasicCalleeAnalysis.cpp b/lib/SILAnalysis/BasicCalleeAnalysis.cpp
@@ -29,7 +29,8 @@ void CalleeCache::sortAndUniqueCallees() {
     // Sort by enumeration number so that clients get a stable order.
     std::sort(Callees.begin(), Callees.end(),
               [](SILFunction *Left, SILFunction *Right) {
-                return Left->getName().compare(Right->getName());
+                // Check if Right's lexicographical order is greater than Left.
+                return 1 == Right->getName().compare(Left->getName());
               });
 
     // Remove duplicates.

diff --git a/test/SILAnalysis/function-order.sil b/test/SILAnalysis/function-order.sil
@@ -14,8 +14,8 @@ import Builtin
 // CHECK-NEXT: public_bottom
 // CHECK-NEXT: public_middle
 // CHECK-NEXT: public_top
-// CHECK-NEXT: private_derived_foo
 // CHECK-NEXT: private_base_foo
+// CHECK-NEXT: private_derived_foo
 // CHECK-NEXT: call_private
 // CHECK-NEXT: internal_base_foo
 // CHECK-NEXT: internal_derived_foo