Swift Bridging: remove BridgedNode

Author: eeckstein

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -34,7 +34,7 @@ public class Instruction : CustomStringConvertible, Hashable {
   final public var parentFunction: Function { parentBlock.parentFunction }
 
   final public var description: String {
-    let stdString = SILNode_debugDescription(bridgedNode)
+    let stdString = bridged.getDebugDescription()
     return String(_cxxString: stdString)
   }
 
@@ -138,7 +138,6 @@ public class Instruction : CustomStringConvertible, Hashable {
   public var bridged: BridgedInstruction {
     BridgedInstruction(SwiftObject(self))
   }
-  var bridgedNode: BridgedNode { BridgedNode(obj: SwiftObject(self)) }
 }
 
 extension BridgedInstruction {
@@ -165,11 +164,6 @@ public class SingleValueInstruction : Instruction, Value {
 }
 
 public final class MultipleValueInstructionResult : Value {
-  final public var description: String {
-    let stdString = SILNode_debugDescription(bridgedNode)
-    return String(_cxxString: stdString)
-  }
-
   public var parentInstruction: MultipleValueInstruction {
     bridged.getParent().getAs(MultipleValueInstruction.self)
   }
@@ -183,7 +177,6 @@ public final class MultipleValueInstructionResult : Value {
   var bridged: BridgedMultiValueResult {
     BridgedMultiValueResult(obj: SwiftObject(self))
   }
-  var bridgedNode: BridgedNode { BridgedNode(obj: SwiftObject(self)) }
 }
 
 extension BridgedMultiValueResult {

SwiftCompilerSources/Sources/SIL/Value.swift

@@ -88,7 +88,7 @@ public enum Ownership {
 
 extension Value {
   public var description: String {
-    let stdString = SILNode_debugDescription(bridgedNode)
+    let stdString = bridged.getDebugDescription()
     return String(_cxxString: stdString)
   }
 
@@ -120,9 +120,6 @@ extension Value {
   public var bridged: BridgedValue {
     BridgedValue(obj: SwiftObject(self as AnyObject))
   }
-  var bridgedNode: BridgedNode {
-    BridgedNode(obj: SwiftObject(self as AnyObject))
-  }
 }
 
 public typealias HashableValue = ObjectIdentifier

include/swift/SIL/SILBridging.h

@@ -73,6 +73,8 @@ struct BridgedValue {
 
   swift::SILValue getSILValue() const { return static_cast<swift::ValueBase *>(obj); }
 
+  std::string getDebugDescription() const;
+
   SWIFT_IMPORT_UNSAFE
   inline OptionalBridgedOperand getFirstUse() const;
 
@@ -353,6 +355,8 @@ struct BridgedInstruction {
 
   swift::SILInstruction * _Nonnull getInst() const { return getAs<swift::SILInstruction>(); }
 
+  std::string getDebugDescription() const;
+
   SWIFT_IMPORT_UNSAFE
   OptionalBridgedInstruction getNext() const {
     auto iter = std::next(getInst()->getIterator());
@@ -786,10 +790,6 @@ struct BridgedSuccessorArray {
   SwiftInt count;
 };
 
-typedef struct {
-  SwiftObject obj;
-} BridgedNode;
-
 struct BridgedVTableEntry {
   const swift::SILVTableEntry * _Nonnull entry;
 
@@ -895,8 +895,6 @@ void PassContext_eraseInstruction(BridgedPassContext passContext,
 void PassContext_eraseBlock(BridgedPassContext passContext,
                             BridgedBasicBlock block);
 
-std::string SILNode_debugDescription(BridgedNode node);
-
 BridgedInstruction SILBuilder_createBuiltinBinaryFunction(
           BridgedBuilder builder, llvm::StringRef name,
           swift::SILType operandType, swift::SILType resultType,

include/swift/SIL/SILBridgingUtils.h

@@ -25,10 +25,6 @@
 
 namespace swift {
 
-inline SILNode *castToSILNode(BridgedNode node) {
-  return static_cast<SILNode *>(node.obj);
-}
-
 ArrayRef<SILValue> getSILValues(BridgedValueArray values,
                                 SmallVectorImpl<SILValue> &storage);
 

lib/SIL/Utils/SILBridging.cpp

@@ -167,10 +167,10 @@ std::string BridgedBasicBlock::getDebugDescription() const {
 //                                SILValue
 //===----------------------------------------------------------------------===//
 
-std::string SILNode_debugDescription(BridgedNode node) {
+std::string BridgedValue::getDebugDescription() const {
   std::string str;
   llvm::raw_string_ostream os(str);
-  castToSILNode(node)->print(os);
+  getSILValue()->print(os);
   str.pop_back(); // Remove trailing newline.
   return str;
 }
@@ -253,6 +253,14 @@ std::string BridgedDefaultWitnessTable::getDebugDescription() const {
 //                               SILInstruction
 //===----------------------------------------------------------------------===//
 
+std::string BridgedInstruction::getDebugDescription() const {
+  std::string str;
+  llvm::raw_string_ostream os(str);
+  getInst()->print(os);
+  str.pop_back(); // Remove trailing newline.
+  return str;
+}
+
 bool BridgedInstruction::mayAccessPointer() const {
   return ::mayAccessPointer(getInst());
 }