[SubtargetFeatures] Add operator< for comparing SubtargetInfoKV objects. NFCI

Use instead of passing a lambda to std::is_sorted. This is more consistent with SubtargetFeatureKV.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@355300 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/MC/SubtargetFeature.h b/include/llvm/MC/SubtargetFeature.h
index 6dc4931f5ac659701a5da971af95c17714f9e523..ee2782797947fe7eb7f326e31d43948c5e2d8018 100644 (file)
--- a/include/llvm/MC/SubtargetFeature.h
+++ b/include/llvm/MC/SubtargetFeature.h
@@ -100,6 +100,11 @@ struct SubtargetInfoKV {
   bool operator<(StringRef S) const {
     return StringRef(Key) < S;
   }
+
+  /// Compare routine for std::is_sorted.
+  bool operator<(const SubtargetInfoKV &Other) const {
+    return StringRef(Key) < StringRef(Other.Key);
+  }
 };
 
 //===----------------------------------------------------------------------===//

diff --git a/lib/MC/MCSubtargetInfo.cpp b/lib/MC/MCSubtargetInfo.cpp
index 540af9a9d478d9555bd5923fbfeeb495350ec8d0..9e7ea5952557222299d9953f8245c24d283227e6 100644 (file)
--- a/lib/MC/MCSubtargetInfo.cpp
+++ b/lib/MC/MCSubtargetInfo.cpp
@@ -87,10 +87,7 @@ const MCSchedModel &MCSubtargetInfo::getSchedModelForCPU(StringRef CPU) const {
 
   ArrayRef<SubtargetInfoKV> SchedModels(ProcSchedModels, ProcDesc.size());
 
-  assert(std::is_sorted(SchedModels.begin(), SchedModels.end(),
-                    [](const SubtargetInfoKV &LHS, const SubtargetInfoKV &RHS) {
-                      return strcmp(LHS.Key, RHS.Key) < 0;
-                    }) &&
+  assert(std::is_sorted(SchedModels.begin(), SchedModels.end()) &&
          "Processor machine model table is not sorted");
 
   // Find entry