Swift Bridging: remove C bridging functions for SILDebugLocation

Author: eeckstein

SwiftCompilerSources/Sources/SIL/Location.swift

@@ -16,13 +16,13 @@ public struct Location: Equatable, CustomStringConvertible {
   let bridged: swift.SILDebugLocation
 
   public var description: String {
-    let stdString = SILLocation_debugDescription(bridged)
+    let stdString = bridged.getDebugDescription()
     return String(_cxxString: stdString)
   }
 
   /// Keeps the debug scope but marks it as auto-generated.
   public var autoGenerated: Location {
-    Location(bridged: SILLocation_getAutogeneratedLocation(bridged))
+    Location(bridged: bridged.getAutogeneratedLocation())
   }
 
   public var hasValidLineNumber: Bool { bridged.hasValidLineNumber() }
@@ -31,10 +31,10 @@ public struct Location: Equatable, CustomStringConvertible {
   public var isDebugSteppable: Bool { hasValidLineNumber && !isAutoGenerated }
 
   public static func ==(lhs: Location, rhs: Location) -> Bool {
-    SILLocation_equal(lhs.bridged, rhs.bridged)
+    lhs.bridged.isEqualTo(rhs.bridged)
   }
 
   public func hasSameSourceLocation(as other: Location) -> Bool {
-    SILLocation_hasSameSourceLocation(bridged, other.bridged)
+    bridged.hasSameSourceLocation(other.bridged)
   }
 }

include/swift/SIL/SILBridging.h

@@ -897,12 +897,6 @@ void PassContext_eraseBlock(BridgedPassContext passContext,
 
 std::string SILNode_debugDescription(BridgedNode node);
 
-std::string SILLocation_debugDescription(swift::SILDebugLocation loc);
-swift::SILDebugLocation
-SILLocation_getAutogeneratedLocation(swift::SILDebugLocation loc);
-bool SILLocation_equal(swift::SILDebugLocation lhs, swift::SILDebugLocation rhs);
-bool SILLocation_hasSameSourceLocation(swift::SILDebugLocation lhs, swift::SILDebugLocation rhs);
-
 BridgedInstruction SILBuilder_createBuiltinBinaryFunction(
           BridgedBuilder builder, llvm::StringRef name,
           swift::SILType operandType, swift::SILType resultType,

include/swift/SIL/SILLocation.h

@@ -702,6 +702,23 @@ class SILDebugLocation {
   bool hasValidLineNumber() const { return location.hasValidLineNumber(); }
   bool isAutoGenerated() const { return location.isAutoGenerated(); }
   operator bool() const { return bool(location) && debugScope; }
+
+  std::string getDebugDescription() const;
+
+  SWIFT_IMPORT_UNSAFE
+  SILDebugLocation getAutogeneratedLocation() const {
+    SILDebugLocation autoGenLoc(RegularLocation::getAutoGeneratedLocation(), getScope());
+    return autoGenLoc;
+  }
+
+  bool isEqualTo(SILDebugLocation rhs) const {
+    return getLocation() == rhs.getLocation() && getScope() == rhs.getScope();
+  }
+
+  bool hasSameSourceLocation(swift::SILDebugLocation rhs) const {
+    return getLocation().hasSameSourceLocation(rhs.getLocation()) &&
+           getScope() == rhs.getScope();
+  }
 };
 
 } // end swift namespace

lib/SIL/IR/SILLocation.cpp

@@ -280,3 +280,21 @@ ImplicitReturnLocation::ImplicitReturnLocation(SILLocation L)
          L.isASTNode<PatternBindingDecl>() ||
          L.isNull());
 }
+
+std::string SILDebugLocation::getDebugDescription() const {
+  std::string str;
+  llvm::raw_string_ostream os(str);
+  SILLocation loc = getLocation();
+  loc.print(os);
+#ifndef NDEBUG
+  if (const SILDebugScope *scope = getScope()) {
+    if (DeclContext *dc = loc.getAsDeclContext()) {
+      os << ", scope=";
+      scope->print(dc->getASTContext().SourceMgr, os, /*indent*/ 2);
+    } else {
+      os << ", scope=?";
+    }
+  }
+#endif
+  return str;
+}

lib/SIL/Utils/SILBridging.cpp

@@ -189,43 +189,6 @@ BridgedValue::Kind BridgedValue::getKind() const {
   llvm_unreachable("unknown SILValue");
 }
 
-//===----------------------------------------------------------------------===//
-//                                SILLocation
-//===----------------------------------------------------------------------===//
-
-std::string SILLocation_debugDescription(swift::SILDebugLocation dloc) {
-  std::string str;
-  llvm::raw_string_ostream os(str);
-  SILLocation loc = dloc.getLocation();
-  loc.print(os);
-#ifndef NDEBUG
-  if (const SILDebugScope *scope = dloc.getScope()) {
-    if (DeclContext *dc = loc.getAsDeclContext()) {
-      os << ", scope=";
-      scope->print(dc->getASTContext().SourceMgr, os, /*indent*/ 2);
-    } else {
-      os << ", scope=?";
-    }
-  }
-#endif
-  return str;
-}
-
-SILDebugLocation SILLocation_getAutogeneratedLocation(SILDebugLocation loc) {
-  SILDebugLocation autoGenLoc(RegularLocation::getAutoGeneratedLocation(),
-                              loc.getScope());
-  return autoGenLoc;
-}
-
-bool SILLocation_equal(swift::SILDebugLocation lhs, swift::SILDebugLocation rhs) {
-  return lhs.getLocation() == rhs.getLocation() && lhs.getScope() == rhs.getScope();
-}
-
-bool SILLocation_hasSameSourceLocation(swift::SILDebugLocation lhs, swift::SILDebugLocation rhs) {
-  return lhs.getLocation().hasSameSourceLocation(rhs.getLocation()) &&
-         lhs.getScope() == rhs.getScope();
-}
-
 //===----------------------------------------------------------------------===//
 //                            SILGlobalVariable
 //===----------------------------------------------------------------------===//