Index: llvm/test/tools/llvm-reduce/reduce-attributes-optnone-noinline.ll
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-reduce/reduce-attributes-optnone-noinline.ll
@@ -0,0 +1,38 @@
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=attributes --test FileCheck --test-arg -check-prefixes=INTERESTING,INTERESTING-NOINLINE --test-arg %s --test-arg --input-file %s -o %t.0
+; RUN: FileCheck --check-prefix=RESULT-NOINLINE %s < %t.0
+
+; RUN: llvm-reduce --abort-on-invalid-reduction --delta-passes=attributes --test FileCheck --test-arg -check-prefixes=INTERESTING,INTERESTING-OPTNONE --test-arg %s --test-arg --input-file %s -o %t.1
+; RUN: FileCheck --check-prefix=RESULT-OPTNONE %s < %t.1
+
+
+; Make sure this doesn't hit the "Attribute 'optnone' requires
+; 'noinline'!" verifier error. optnone can be dropped separately from
+; noinline, but removing noinline requires removing the pair together.
+
+
+; INTERESTING: @keep_func() [[KEEP_ATTRS:#[0-9]+]]
+; RESULT-NOINLINE: define void @keep_func() [[KEEP_ATTRS:#[0-9]+]] {
+; RESULT-OPTNONE: define void @keep_func() [[KEEP_ATTRS:#[0-9]+]] {
+define void @keep_func() #0 {
+  ret void
+}
+
+; Both should be removed together
+; INTERESTING: @drop_func()
+; RESULT-NOINLINE: define void @drop_func() {
+; RESULT-OPTNONE: define void @drop_func() {
+define void @drop_func() #0 {
+  ret void
+}
+
+; RESULT-NOINLINE: attributes [[KEEP_ATTRS]] = { noinline }
+; RESULT-OPTNONE: attributes [[KEEP_ATTRS]] = { noinline optnone }
+
+
+; INTERESTING-NOINLINE: attributes [[KEEP_ATTRS]] =
+; INTERESTING-NOINLINE-SAME: noinline
+
+; INTERESTING-OPTNONE: attributes [[KEEP_ATTRS]] =
+; INTERESTING-OPTNONE-SAME: optnone
+
+attributes #0 = { noinline optnone }
Index: llvm/tools/llvm-reduce/deltas/ReduceAttributes.cpp
===================================================================
--- llvm/tools/llvm-reduce/deltas/ReduceAttributes.cpp
+++ llvm/tools/llvm-reduce/deltas/ReduceAttributes.cpp
@@ -42,7 +42,7 @@
 
 namespace {
 
-using AttrPtrVecTy = std::vector<const Attribute *>;
+using AttrPtrVecTy = std::vector<Attribute>;
 using AttrPtrIdxVecVecTy = std::pair<unsigned, AttrPtrVecTy>;
 using AttrPtrVecVecTy = SmallVector<AttrPtrIdxVecVecTy, 3>;
 
@@ -94,13 +94,36 @@
     }
   }
 
+  // FIXME: Should just directly use AttrBuilder instead of going through
+  // AttrPtrVecTy
   void visitAttributeSet(const AttributeSet &AS,
                          AttrPtrVecTy &AttrsToPreserve) {
     assert(AttrsToPreserve.empty() && "Should not be sharing vectors.");
     AttrsToPreserve.reserve(AS.getNumAttributes());
-    for (const Attribute &A : AS)
+
+    // Optnone requires noinline, so removing noinline requires removing the
+    // pair.
+    Attribute NoInline = AS.getAttribute(Attribute::NoInline);
+    bool RemoveNoInline = false;
+    if (NoInline.isValid()) {
+      RemoveNoInline = !O.shouldKeep();
+      if (!RemoveNoInline)
+        AttrsToPreserve.emplace_back(NoInline);
+    }
+
+    for (Attribute A : AS) {
+      if (A.isEnumAttribute()) {
+        Attribute::AttrKind Kind = A.getKindAsEnum();
+        if (Kind == Attribute::NoInline)
+          continue;
+
+        if (RemoveNoInline && Kind == Attribute::OptimizeNone)
+          continue;
+      }
+
       if (O.shouldKeep())
-        AttrsToPreserve.emplace_back(&A);
+        AttrsToPreserve.emplace_back(A);
+    }
   }
 };
 
@@ -138,12 +161,11 @@
 
 } // namespace
 
-AttributeSet
-convertAttributeRefToAttributeSet(LLVMContext &C,
-                                  ArrayRef<const Attribute *> Attributes) {
+AttributeSet convertAttributeRefToAttributeSet(LLVMContext &C,
+                                               ArrayRef<Attribute> Attributes) {
   AttrBuilder B(C);
-  for (const Attribute *A : Attributes)
-    B.addAttribute(*A);
+  for (Attribute A : Attributes)
+    B.addAttribute(A);
   return AttributeSet::get(C, B);
 }