Use std::is_sorted and std::none_of instead of manual loops. NFC

[oota-llvm.git] / lib / IR / Attributes.cpp

diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index bcf7dc365ce566bcd881fa0a53787dcd7f9b3b2d..6c01bb6456293d443d8d055f55203f2e82e98cdd 100644 (file)
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -641,14 +641,15 @@ AttributeSet AttributeSet::get(LLVMContext &C,
   if (Attrs.empty())
     return AttributeSet();
 
   if (Attrs.empty())
     return AttributeSet();
 

-#ifndef NDEBUG
-  for (unsigned i = 0, e = Attrs.size(); i != e; ++i) {
-    assert((!i || Attrs[i-1].first <= Attrs[i].first) &&
-           "Misordered Attributes list!");
-    assert(!Attrs[i].second.hasAttribute(Attribute::None) &&
-           "Pointless attribute!");
-  }
-#endif
+  assert(std::is_sorted(Attrs.begin(), Attrs.end(),
+                        [](const std::pair<unsigned, Attribute> &LHS,
+                           const std::pair<unsigned, Attribute> &RHS) {
+                          return LHS.first < RHS.first;
+                        }) && "Misordered Attributes list!");
+  assert(std::none_of(Attrs.begin(), Attrs.end(),
+                      [](const std::pair<unsigned, Attribute> &Pair) {
+                        return Pair.second.hasAttribute(Attribute::None);
+                      }) && "Pointless attribute!");

 
   // Create a vector if (unsigned, AttributeSetNode*) pairs from the attributes
   // list.
 
   // Create a vector if (unsigned, AttributeSetNode*) pairs from the attributes
   // list.