Merge pull request #83636 from eeckstein/optionset-insert

stdlib: specialize `OptionSet.insert` for FixedWidthInteger raw-values

Author: eeckstein

stdlib/public/core/OptionSet.swift

@@ -374,3 +374,15 @@ extension OptionSet where RawValue: FixedWidthInteger {
     self = Self(rawValue: self.rawValue ^ other.rawValue)
   }
 }
+
+extension OptionSet where RawValue: FixedWidthInteger, Element == Self {
+  @_alwaysEmitIntoClient
+  @discardableResult
+  public mutating func insert(
+    _ newMember: Element
+  ) -> (inserted: Bool, memberAfterInsert: Element) {
+    let inserted = !self.contains(newMember)
+    self = Self(rawValue: self.rawValue | newMember.rawValue)
+    return (inserted, newMember)
+  }
+}

test/SILOptimizer/optionset.swift

@@ -1,5 +1,5 @@
-// RUN: %target-swift-frontend  -parse-as-library -primary-file %s -O -sil-verify-all -module-name=test -Xllvm -sil-print-types -emit-sil | grep -v debug_value | %FileCheck %s
-// RUN: %target-swift-frontend  -parse-as-library -primary-file %s -Osize -sil-verify-all -module-name=test -Xllvm -sil-print-types -emit-sil | grep -v debug_value | %FileCheck %s
+// RUN: %target-swift-frontend  -parse-as-library -primary-file %s -O -sil-verify-all -module-name=test -emit-sil | grep -v debug_value | %FileCheck %s
+// RUN: %target-swift-frontend  -parse-as-library -primary-file %s -Osize -sil-verify-all -module-name=test -emit-sil | grep -v debug_value | %FileCheck %s
 // REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
 // REQUIRES: swift_in_compiler
 
@@ -15,8 +15,8 @@ public struct TestOptions: OptionSet {
 
 // CHECK-LABEL: sil_global hidden [let] @$s4test17globalTestOptionsAA0cD0Vvp : $TestOptions = {
 // CHECK:   [[CONST:%.*]] = integer_literal $Builtin.Int{{32|64}}, 15
-// CHECK:   [[INT:%.*]] = struct $Int (%0 : $Builtin.Int{{32|64}})
-// CHECK:   %initval = struct $TestOptions ([[INT]] : $Int)
+// CHECK:   [[INT:%.*]] = struct $Int (%0)
+// CHECK:   %initval = struct $TestOptions ([[INT]])
 let globalTestOptions: TestOptions = [.first, .second, .third, .fourth]
 
 // CHECK-LABEL: sil @$s4test17returnTestOptionsAA0cD0VyF
@@ -33,12 +33,22 @@ public func returnTestOptions() -> TestOptions {
 
 // CHECK-LABEL: sil @$s4test22returnEmptyTestOptionsAA0dE0VyF
 // CHECK:      bb0:
-// CHECK-NEXT:   integer_literal {{.*}}, 0
-// CHECK-NEXT:   struct $Int
-// CHECK:        builtin "onFastPath"() : $()
-// CHECK-NEXT:   struct $TestOptions
-// CHECK-NEXT:   return
+// CHECK-NEXT:   [[ZERO:%.*]] = integer_literal {{.*}}, 0
+// CHECK:        [[I:%.*]] = struct $Int ([[ZERO]]
+// CHECK:        [[T:%.*]] = struct $TestOptions
+// CHECK:        return [[T]]
 // CHECK:      } // end sil function '$s4test22returnEmptyTestOptionsAA0dE0VyF'
 public func returnEmptyTestOptions() -> TestOptions {
     return []
 }
+
+extension TestOptions {
+    // CHECK-LABEL: sil @$s4test11TestOptionsV12insertSecondyyF :
+    // CHECK-NOT:   bb1
+    // CHECK:         builtin "or
+    // CHECK-NOT:   bb1
+    // CHECK:       } // end sil function '$s4test11TestOptionsV12insertSecondyyF'
+    public mutating func insertSecond() {
+        insert(.second)
+    }
+}