- Fixup SortCodeCompleteResult() to properly sort keywords on Mac OS (compare was system dependent). Worked on Linux, failed on Mac OS (which caused the recently added testcase to fail on Linux).

- Sort results in testcase.

llvm-svn: 83597

2 files changed, 10 insertions, 10 deletions

diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index b6487026501..d7697a7333a 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -986,7 +986,7 @@ namespace {
                                           Y.Declaration->getDeclName());
           
         case Result::RK_Keyword:
-          return strcmp(X.Keyword, Y.Keyword) == -1;
+          return strcmp(X.Keyword, Y.Keyword) < 0;
       }
       
       // Silence GCC warning.
diff --git a/clang/test/CodeCompletion/property.m b/clang/test/CodeCompletion/property.m
index a8dd2ba2eb4..7f2321ee139 100644
--- a/clang/test/CodeCompletion/property.m
+++ b/clang/test/CodeCompletion/property.m
@@ -7,22 +7,22 @@
 @property(copy) Foo *myprop;
 @property(retain, nonatomic) id xx;
 // RUN: clang-cc -fsyntax-only -code-completion-at=%s:7:11 %s -o - | FileCheck -check-prefix=CC1 %s &&
-// CC1: readonly
-// CC1-NEXT: assign
-// CC1-NEXT: readwrite
-// CC1-NEXT: retain
+// CC1: assign
 // CC1-NEXT: copy
+// CC1-NEXT: getter
 // CC1-NEXT: nonatomic
+// CC1-NEXT: readonly
+// CC1-NEXT: readwrite
+// CC1-NEXT: retain
 // CC1-NEXT: setter
-// CC1-NEXT: getter
 // RUN: clang-cc -fsyntax-only -code-completion-at=%s:8:18 %s -o - | FileCheck -check-prefix=CC2 %s
-// CC2: readonly
-// CC2-NEXT: assign
-// CC2-NEXT: readwrite
+// CC2: assign
 // CC2-NEXT: copy
+// CC2-NEXT: getter
 // CC2-NEXT: nonatomic
+// CC2-NEXT: readonly
+// CC2-NEXT: readwrite
 // CC2-NEXT: setter
-// CC2-NEXT: getter
 @end