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

Author: eeckstein

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -171,14 +171,14 @@ public final class MultipleValueInstructionResult : Value {
   }
 
   public var parentInstruction: MultipleValueInstruction {
-    MultiValueInstResult_getParent(bridged).getAs(MultipleValueInstruction.self)
+    bridged.getParent().getAs(MultipleValueInstruction.self)
   }
 
   public var definingInstruction: Instruction? { parentInstruction }
 
   public var parentBlock: BasicBlock { parentInstruction.parentBlock }
 
-  public var index: Int { MultiValueInstResult_getIndex(bridged) }
+  public var index: Int { bridged.getIndex() }
 
   var bridged: BridgedMultiValueResult {
     BridgedMultiValueResult(obj: SwiftObject(self))

include/swift/SIL/SILBridging.h

@@ -315,6 +315,17 @@ struct BridgedGlobalVar {
 
 struct BridgedMultiValueResult {
   SwiftObject obj;
+
+  swift::MultipleValueInstructionResult * _Nonnull getMVResult() const {
+    return static_cast<swift::MultipleValueInstructionResult *>(obj);
+  }
+
+  SWIFT_IMPORT_UNSAFE
+  inline BridgedInstruction getParent() const;
+
+  SwiftInt getIndex() const {
+    return (SwiftInt)getMVResult()->getIndex();
+  }
 };
 
 struct OptionalBridgedInstruction {
@@ -892,9 +903,6 @@ SILLocation_getAutogeneratedLocation(swift::SILDebugLocation loc);
 bool SILLocation_equal(swift::SILDebugLocation lhs, swift::SILDebugLocation rhs);
 bool SILLocation_hasSameSourceLocation(swift::SILDebugLocation lhs, swift::SILDebugLocation rhs);
 
-BridgedInstruction MultiValueInstResult_getParent(BridgedMultiValueResult result);
-SwiftInt MultiValueInstResult_getIndex(BridgedMultiValueResult result);
-
 BridgedInstruction SILBuilder_createBuiltinBinaryFunction(
           BridgedBuilder builder, llvm::StringRef name,
           swift::SILType operandType, swift::SILType resultType,
@@ -967,6 +975,10 @@ OptionalBridgedBasicBlock BridgedFunction::getLastBlock() const {
   return {getFunction()->empty() ? nullptr : &*getFunction()->rbegin()};
 }
 
+BridgedInstruction BridgedMultiValueResult::getParent() const {
+  return {getMVResult()->getParent()};
+}
+
 BridgedBasicBlock BridgedInstruction::getParent() const {
   assert(!getInst()->isStaticInitializerInst() &&
          "cannot get the parent of a static initializer instruction");

lib/SIL/Utils/SILBridging.cpp

@@ -306,15 +306,6 @@ bool BridgedInstruction::mayBeDeinitBarrierNotConsideringSideEffects() const {
   return ::mayBeDeinitBarrierNotConsideringSideEffects(getInst());
 }
 
-BridgedInstruction MultiValueInstResult_getParent(BridgedMultiValueResult result) {
-  return {static_cast<MultipleValueInstructionResult *>(result.obj)->getParent()};
-}
-
-SwiftInt MultiValueInstResult_getIndex(BridgedMultiValueResult result) {
-  auto *rs = static_cast<MultipleValueInstructionResult *>(result.obj);
-  return (SwiftInt)rs->getIndex();
-}
-
 //===----------------------------------------------------------------------===//
 //                                SILBuilder
 //===----------------------------------------------------------------------===//