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

Author: eeckstein

SwiftCompilerSources/Sources/SIL/GlobalVariable.swift

@@ -15,17 +15,17 @@ import SILBridging
 
 final public class GlobalVariable : CustomStringConvertible, HasShortDescription, Hashable {
   public var name: StringRef {
-    return StringRef(bridged: SILGlobalVariable_getName(bridged))
+    return StringRef(bridged: bridged.getName())
   }
 
   public var description: String {
-    let stdString = SILGlobalVariable_debugDescription(bridged)
+    let stdString = bridged.getDebugDescription()
     return String(_cxxString: stdString)
   }
 
   public var shortDescription: String { name.string }
 
-  public var isLet: Bool { SILGlobalVariable_isLet(bridged) != 0 }
+  public var isLet: Bool { bridged.isLet() }
 
   // TODO: initializer instructions
 

include/swift/SIL/SILBridging.h

@@ -285,9 +285,21 @@ struct OptionalBridgedFunction {
   OptionalSwiftObject obj;
 };
 
-typedef struct {
+struct BridgedGlobalVar {
   SwiftObject obj;
-} BridgedGlobalVar;
+
+  SWIFT_IMPORT_UNSAFE
+  swift::SILGlobalVariable * _Nonnull getGlobal() const {
+    return static_cast<swift::SILGlobalVariable *>(obj);
+  }
+
+  std::string getDebugDescription() const;
+
+  SWIFT_IMPORT_UNSAFE
+  llvm::StringRef getName() const { return getGlobal()->getName(); }
+
+  bool isLet() const { return getGlobal()->isLet(); }
+};
 
 struct BridgedBasicBlock {
   SwiftObject obj;
@@ -458,10 +470,6 @@ void PassContext_eraseInstruction(BridgedPassContext passContext,
 void PassContext_eraseBlock(BridgedPassContext passContext,
                             BridgedBasicBlock block);
 
-llvm::StringRef SILGlobalVariable_getName(BridgedGlobalVar global);
-std::string SILGlobalVariable_debugDescription(BridgedGlobalVar global);
-SwiftInt SILGlobalVariable_isLet(BridgedGlobalVar global);
-
 OptionalBridgedBasicBlock SILBasicBlock_next(BridgedBasicBlock block);
 OptionalBridgedBasicBlock SILBasicBlock_previous(BridgedBasicBlock block);
 BridgedFunction SILBasicBlock_getFunction(BridgedBasicBlock block);

include/swift/SIL/SILBridgingUtils.h

@@ -51,10 +51,6 @@ template <class A = SILArgument> A *castToArgument(BridgedArgument argument) {
   return cast<A>(static_cast<SILArgument *>(argument.obj));
 }
 
-inline SILGlobalVariable *castToGlobal(BridgedGlobalVar global) {
-  return static_cast<SILGlobalVariable *>(global.obj);
-}
-
 inline ValueOwnershipKind castToOwnership(BridgedValue::Ownership ownership) {
   switch (ownership) {
     case BridgedValue::Ownership::Unowned:    return OwnershipKind::Unowned;

lib/SIL/Utils/SILBridging.cpp

@@ -363,22 +363,14 @@ bool SILLocation_hasSameSourceLocation(swift::SILDebugLocation lhs, swift::SILDe
 //                            SILGlobalVariable
 //===----------------------------------------------------------------------===//
 
-llvm::StringRef SILGlobalVariable_getName(BridgedGlobalVar global) {
-  return castToGlobal(global)->getName();
-}
-
-std::string SILGlobalVariable_debugDescription(BridgedGlobalVar global) {
+std::string BridgedGlobalVar::getDebugDescription() const {
   std::string str;
   llvm::raw_string_ostream os(str);
-  castToGlobal(global)->print(os);
+  getGlobal()->print(os);
   str.pop_back(); // Remove trailing newline.
   return str;
 }
 
-SwiftInt SILGlobalVariable_isLet(BridgedGlobalVar global) {
-  return castToGlobal(global)->isLet();
-}
-
 //===----------------------------------------------------------------------===//
 //                            SILVTable
 //===----------------------------------------------------------------------===//