diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 99df5ffb210..77a1c82a99f 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -596,7 +596,7 @@ AttributeSet AttributeSet::get(LLVMContext &C, unsigned Idx, AttrBuilder &B) {
   // Add target-independent attributes.
   SmallVector<std::pair<unsigned, Attribute>, 8> Attrs;
   for (Attribute::AttrKind Kind = Attribute::None;
-       Kind != Attribute::EndAttrKinds; ++Kind) {
+       Kind != Attribute::EndAttrKinds; Kind = Attribute::AttrKind(Kind + 1)) {
     if (!B.contains(Kind))
       continue;