Swift Bridging: use C++ instead of C bridging for BridgedInstruction

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/PassManager/Context.swift

@@ -102,7 +102,7 @@ struct FunctionPassContext : MutatingContext {
   var notifyInstructionChanged: (Instruction) -> () { return { inst in } }
 
   func continueWithNextSubpassRun(for inst: Instruction? = nil) -> Bool {
-    let bridgedInst = OptionalBridgedInstruction(obj: inst?.bridged.obj)
+    let bridgedInst = OptionalBridgedInstruction(inst?.bridged.obj)
     return PassContext_continueWithNextSubpassRun(_bridged, bridgedInst) != 0
   }
 
@@ -278,15 +278,15 @@ extension Instruction {
       context.notifyCallsChanged()
     }
     context.notifyInstructionsChanged()
-    SILInstruction_setOperand(bridged, index, value.bridged)
+    bridged.setOperand(index, value.bridged)
     context.notifyInstructionChanged(self)
   }
 }
 
 extension RefCountingInst {
   func setAtomicity(isAtomic: Bool, _ context: some MutatingContext) {
     context.notifyInstructionsChanged()
-    RefCountingInst_setIsAtomic(bridged, isAtomic)
+    bridged.RefCountingInst_setIsAtomic(isAtomic)
     context.notifyInstructionChanged(self)
   }
 }

SwiftCompilerSources/Sources/SIL/ApplySite.swift

@@ -71,7 +71,7 @@ extension ApplySite {
   ///
   /// This does not include the callee function operand.
   public var argumentOperands: OperandArray {
-    let numArgs = ApplySite_getNumArguments(bridged)
+    let numArgs = bridged.ApplySite_getNumArguments()
     let offset = ApplyOperands.firstArgumentIndex
     return operands[offset..<(numArgs + offset)]
   }
@@ -84,7 +84,7 @@ extension ApplySite {
   }
 
   public var substitutionMap: SubstitutionMap {
-    SubstitutionMap(ApplySite_getSubstitutionMap(bridged))
+    SubstitutionMap(bridged.ApplySite_getSubstitutionMap())
   }
 
   /// Returns the argument index of an operand.
@@ -106,7 +106,7 @@ extension ApplySite {
   }
 
   public func getArgumentConvention(calleeArgIndex: Int) -> ArgumentConvention {
-    return ApplySite_getArgumentConvention(bridged, calleeArgIndex).convention
+    return bridged.ApplySite_getArgumentConvention(calleeArgIndex).convention
   }
 
   public var referencedFunction: Function? {
@@ -138,6 +138,6 @@ extension FullApplySite {
   ///
   /// 0 if the callee has a direct or no return value and 1, if it has an indirect return value.
   public var numIndirectResultArguments: Int {
-    return FullApplySite_numIndirectResultArguments(bridged)
+    return bridged.FullApplySite_numIndirectResultArguments()
   }
 }

SwiftCompilerSources/Sources/SIL/Builder.swift

@@ -33,7 +33,7 @@ public struct Builder {
                             insertAtEnd: OptionalBridgedBasicBlock.none,
                             loc: location.bridged)
     case .atEndOf(let block):
-      return BridgedBuilder(insertBefore: OptionalBridgedInstruction.none,
+      return BridgedBuilder(insertBefore: OptionalBridgedInstruction(),
                             insertAtEnd: block.bridged.optional,
                             loc: location.bridged)
     }