Swift Optimizer: make the set's insert functions return a Bool.

Returning true if the element was not contained in the set before inserting

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/DataStructures/BasicBlockRange.swift

@@ -78,8 +78,7 @@ struct BasicBlockRange : CustomStringConvertible, CustomReflectable {
 
   /// Insert a potential end block.
   mutating func insert(_ block: BasicBlock) {
-    if !wasInserted.contains(block) {
-      wasInserted.insert(block)
+    if wasInserted.insert(block) {
       inserted.append(block)
     }
     worklist.pushIfNotVisited(block)

SwiftCompilerSources/Sources/Optimizer/DataStructures/BasicBlockWorklist.swift

@@ -34,8 +34,7 @@ struct BasicBlockWorklist : CustomStringConvertible, CustomReflectable {
 
   /// Pushes \p block onto the worklist if \p block has never been pushed before.
   mutating func pushIfNotVisited(_ block: BasicBlock) {
-    if !pushedBlocks.contains(block) {
-      pushedBlocks.insert(block);
+    if pushedBlocks.insert(block) {
       worklist.append(block)
     }
   }

SwiftCompilerSources/Sources/Optimizer/DataStructures/Set.swift

@@ -35,8 +35,10 @@ struct BasicBlockSet : CustomStringConvertible, CustomReflectable {
     BasicBlockSet_contains(bridged, block.bridged) != 0
   }
 
-  mutating func insert(_ block: BasicBlock) {
-    BasicBlockSet_insert(bridged, block.bridged)
+  /// Returns true if `block` was not contained in the set before inserting.
+  @discardableResult
+  mutating func insert(_ block: BasicBlock) -> Bool {
+    BasicBlockSet_insert(bridged, block.bridged) != 0
   }
 
   mutating func erase(_ block: BasicBlock) {
@@ -80,8 +82,10 @@ struct ValueSet : CustomStringConvertible, CustomReflectable {
     NodeSet_containsValue(bridged, value.bridged) != 0
   }
 
-  mutating func insert(_ value: Value) {
-    NodeSet_insertValue(bridged, value.bridged)
+  /// Returns true if `value` was not contained in the set before inserting.
+  @discardableResult
+  mutating func insert(_ value: Value) -> Bool {
+    NodeSet_insertValue(bridged, value.bridged) != 0
   }
 
   mutating func erase(_ value: Value) {
@@ -139,8 +143,10 @@ struct InstructionSet : CustomStringConvertible, CustomReflectable {
     NodeSet_containsInstruction(bridged, inst.bridged) != 0
   }
 
-  mutating func insert(_ inst: Instruction) {
-    NodeSet_insertInstruction(bridged, inst.bridged)
+  /// Returns true if `inst` was not contained in the set before inserting.
+  @discardableResult
+  mutating func insert(_ inst: Instruction) -> Bool {
+    NodeSet_insertInstruction(bridged, inst.bridged) != 0
   }
 
   mutating func erase(_ inst: Instruction) {

include/swift/SILOptimizer/OptimizerBridging.h

@@ -135,18 +135,18 @@ BridgedBasicBlockSet PassContext_allocBasicBlockSet(BridgedPassContext context);
 void PassContext_freeBasicBlockSet(BridgedPassContext context,
                                    BridgedBasicBlockSet set);
 SwiftInt BasicBlockSet_contains(BridgedBasicBlockSet set, BridgedBasicBlock block);
-void BasicBlockSet_insert(BridgedBasicBlockSet set, BridgedBasicBlock block);
+SwiftInt BasicBlockSet_insert(BridgedBasicBlockSet set, BridgedBasicBlock block);
 void BasicBlockSet_erase(BridgedBasicBlockSet set, BridgedBasicBlock block);
 BridgedFunction BasicBlockSet_getFunction(BridgedBasicBlockSet set);
 
 BridgedNodeSet PassContext_allocNodeSet(BridgedPassContext context);
 void PassContext_freeNodeSet(BridgedPassContext context,
                              BridgedNodeSet set);
 SwiftInt NodeSet_containsValue(BridgedNodeSet set, BridgedValue value);
-void NodeSet_insertValue(BridgedNodeSet set, BridgedValue value);
+SwiftInt NodeSet_insertValue(BridgedNodeSet set, BridgedValue value);
 void NodeSet_eraseValue(BridgedNodeSet set, BridgedValue value);
 SwiftInt NodeSet_containsInstruction(BridgedNodeSet set, BridgedInstruction inst);
-void NodeSet_insertInstruction(BridgedNodeSet set, BridgedInstruction inst);
+SwiftInt NodeSet_insertInstruction(BridgedNodeSet set, BridgedInstruction inst);
 void NodeSet_eraseInstruction(BridgedNodeSet set, BridgedInstruction inst);
 BridgedFunction NodeSet_getFunction(BridgedNodeSet set);
 

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -1469,8 +1469,8 @@ SwiftInt BasicBlockSet_contains(BridgedBasicBlockSet set, BridgedBasicBlock bloc
   return castToBlockSet(set)->contains(castToBasicBlock(block)) ? 1 : 0;
 }
 
-void BasicBlockSet_insert(BridgedBasicBlockSet set, BridgedBasicBlock block) {
-  castToBlockSet(set)->insert(castToBasicBlock(block));
+SwiftInt BasicBlockSet_insert(BridgedBasicBlockSet set, BridgedBasicBlock block) {
+  return castToBlockSet(set)->insert(castToBasicBlock(block)) ? 1 : 0;
 }
 
 void BasicBlockSet_erase(BridgedBasicBlockSet set, BridgedBasicBlock block) {
@@ -1494,8 +1494,8 @@ SwiftInt NodeSet_containsValue(BridgedNodeSet set, BridgedValue value) {
   return castToNodeSet(set)->contains(castToSILValue(value)) ? 1 : 0;
 }
 
-void NodeSet_insertValue(BridgedNodeSet set, BridgedValue value) {
-  castToNodeSet(set)->insert(castToSILValue(value));
+SwiftInt NodeSet_insertValue(BridgedNodeSet set, BridgedValue value) {
+  return castToNodeSet(set)->insert(castToSILValue(value)) ? 1 : 0;
 }
 
 void NodeSet_eraseValue(BridgedNodeSet set, BridgedValue value) {
@@ -1506,8 +1506,8 @@ SwiftInt NodeSet_containsInstruction(BridgedNodeSet set, BridgedInstruction inst
   return castToNodeSet(set)->contains(castToInst(inst)->asSILNode()) ? 1 : 0;
 }
 
-void NodeSet_insertInstruction(BridgedNodeSet set, BridgedInstruction inst) {
-  castToNodeSet(set)->insert(castToInst(inst)->asSILNode());
+SwiftInt NodeSet_insertInstruction(BridgedNodeSet set, BridgedInstruction inst) {
+  return castToNodeSet(set)->insert(castToInst(inst)->asSILNode()) ? 1 : 0;
 }
 
 void NodeSet_eraseInstruction(BridgedNodeSet set, BridgedInstruction inst) {