Bridging: Bridge swift::CharSourceRange directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -513,7 +513,7 @@ class BridgedDiagnosticArgument {
 
 class BridgedFixIt {
 public:
-  BridgedCharSourceRange replacementRange;
+  swift::CharSourceRange replacementRange;
   BridgedStringRef replacementText;
 };
 
@@ -1219,7 +1219,7 @@ BridgedProjectedValuePropertyAttr_createParsed(BridgedASTContext cContext,
 SWIFT_NAME("BridgedRawDocCommentAttr.createParsed(_:range:)")
 BridgedRawDocCommentAttr
 BridgedRawDocCommentAttr_createParsed(BridgedASTContext cContext,
-                                      BridgedCharSourceRange cRange);
+                                      swift::CharSourceRange range);
 
 SWIFT_NAME("BridgedRawLayoutAttr.createParsed(_:atLoc:range:size:alignment:)")
 BridgedRawLayoutAttr BridgedStorageRestrictionsAttr_createParsed(
@@ -2113,13 +2113,13 @@ class BridgedRegexLiteralPatternFeatureKind final {
 };
 
 class BridgedRegexLiteralPatternFeature final {
-  BridgedCharSourceRange Range;
+  swift::CharSourceRange Range;
   BridgedRegexLiteralPatternFeatureKind Kind;
 
 public:
   SWIFT_NAME("init(kind:at:)")
   BridgedRegexLiteralPatternFeature(BridgedRegexLiteralPatternFeatureKind kind,
-                                    BridgedCharSourceRange range)
+                                    swift::CharSourceRange range)
       : Range(range), Kind(kind) {}
 
   using UnbridgedTy = swift::RegexLiteralPatternFeature;

include/swift/AST/ASTBridgingImpl.h

@@ -874,7 +874,7 @@ BridgedRegexLiteralPatternFeature::BridgedRegexLiteralPatternFeature(
 
 BridgedRegexLiteralPatternFeature::UnbridgedTy
 BridgedRegexLiteralPatternFeature::unbridged() const {
-  return UnbridgedTy(Kind.unbridged(), Range.unbridged());
+  return UnbridgedTy(Kind.unbridged(), Range);
 }
 
 BridgedRegexLiteralPatternFeatures::UnbridgedTy

include/swift/Basic/BasicBridging.h

@@ -317,33 +317,6 @@ class BridgedOStream {
 
 BridgedOStream Bridged_dbgs();
 
-//===----------------------------------------------------------------------===//
-// MARK: BridgedCharSourceRange
-//===----------------------------------------------------------------------===//
-
-class BridgedCharSourceRange {
-public:
-  SWIFT_UNAVAILABLE("Use '.start' instead")
-  swift::SourceLoc Start;
-
-  SWIFT_UNAVAILABLE("Use '.byteLength' instead")
-  unsigned ByteLength;
-
-  SWIFT_NAME("init(start:byteLength:)")
-  BridgedCharSourceRange(swift::SourceLoc start, unsigned byteLength)
-      : Start(start), ByteLength(byteLength) {}
-
-  BRIDGED_INLINE BridgedCharSourceRange(swift::CharSourceRange range);
-
-  BRIDGED_INLINE swift::CharSourceRange unbridged() const;
-
-  SWIFT_COMPUTED_PROPERTY
-  swift::SourceLoc getStart() const { return Start; }
-
-  SWIFT_COMPUTED_PROPERTY
-  SwiftInt getByteLength() const { return static_cast<SwiftInt>(ByteLength); }
-};
-
 //===----------------------------------------------------------------------===//
 // MARK: std::vector<BridgedCharSourceRange>
 //===----------------------------------------------------------------------===//
@@ -360,7 +333,7 @@ class BridgedCharSourceRangeVector {
   BridgedCharSourceRangeVector();
 
   SWIFT_NAME("append(_:)")
-  void push_back(BridgedCharSourceRange range);
+  void push_back(swift::CharSourceRange range);
 
 #ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
   /// Returns the `std::vector<swift::CharSourceRange>` that this

include/swift/Basic/BasicBridgingImpl.h

@@ -14,7 +14,6 @@
 #define SWIFT_BASIC_BASICBRIDGINGIMPL_H
 
 #include "swift/Basic/Assertions.h"
-#include "swift/Basic/SourceLoc.h"
 #include "llvm/ADT/StringRef.h"
 
 SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
@@ -38,17 +37,6 @@ llvm::StringRef BridgedStringRef::unbridged() const {
 
 llvm::StringRef BridgedOwnedString::unbridgedRef() const { return llvm::StringRef(Data, Length); }
 
-//===----------------------------------------------------------------------===//
-// MARK: BridgedCharSourceRange
-//===----------------------------------------------------------------------===//
-
-BridgedCharSourceRange::BridgedCharSourceRange(swift::CharSourceRange range)
-    : Start(range.getStart()), ByteLength(range.getByteLength()) {}
-
-swift::CharSourceRange BridgedCharSourceRange::unbridged() const {
-  return swift::CharSourceRange(Start, ByteLength);
-}
-
 //===----------------------------------------------------------------------===//
 // MARK: BridgedSwiftVersion
 //===----------------------------------------------------------------------===//

include/swift/Basic/SourceLoc.h

@@ -89,15 +89,16 @@ class SourceLoc {
     return SourceLoc::getFromPointer(Pointer + ByteOffset);
   }
 
-// Not imported into Swift in pure bridging mode.
-#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
-
+  SWIFT_UNAVAILABLE("Unavailable in Swift")
   SourceLoc getAdvancedLocOrInvalid(int ByteOffset) const {
     if (isValid())
       return getAdvancedLoc(ByteOffset);
     return SourceLoc();
   }
 
+// Not imported into Swift in pure bridging mode.
+#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+
   /// An explicit bool operator so one can check if a SourceLoc is valid in an
   /// if statement:
   ///
@@ -226,9 +227,6 @@ class SourceRange {
 #endif // #ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
 };
 
-// Not imported into Swift in pure bridging mode.
-#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
-
 /// A half-open character-based source range.
 class CharSourceRange {
   SourceLoc Start;
@@ -238,29 +236,40 @@ class CharSourceRange {
   /// Constructs an invalid range.
   CharSourceRange() = default;
 
+  SWIFT_NAME("init(start:byteLength:)")
   CharSourceRange(SourceLoc Start, unsigned ByteLength)
     : Start(Start), ByteLength(ByteLength) {}
 
+// Not imported into Swift in pure bridging mode.
+#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+
   /// Constructs a character range which starts and ends at the
   /// specified character locations.
   CharSourceRange(const SourceManager &SM, SourceLoc Start, SourceLoc End);
 
   /// Use Lexer::getCharSourceRangeFromSourceRange() instead.
   CharSourceRange(const SourceManager &SM, SourceRange Range) = delete;
 
+#endif // #ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+
   bool isValid() const { return Start.isValid(); }
   bool isInvalid() const { return !isValid(); }
 
-  bool operator==(const CharSourceRange &other) const {
-    return Start == other.Start && ByteLength == other.ByteLength;
-  }
-  bool operator!=(const CharSourceRange &other) const {
-    return !operator==(other);
-  }
-
+  SWIFT_COMPUTED_PROPERTY
   SourceLoc getStart() const { return Start; }
+  SWIFT_COMPUTED_PROPERTY
   SourceLoc getEnd() const { return Start.getAdvancedLocOrInvalid(ByteLength); }
 
+  /// Return the length of this valid range in bytes.  Can be zero.
+  SWIFT_COMPUTED_PROPERTY
+  unsigned getByteLength() const {
+    assert(isValid() && "length does not make sense for an invalid range");
+    return ByteLength;
+  }
+
+// Not imported into Swift in pure bridging mode.
+#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+
   /// Returns true if the given source location is contained in the range.
   bool contains(SourceLoc loc) const {
     auto less = std::less<const char *>();
@@ -296,12 +305,13 @@ class CharSourceRange {
 
   StringRef str() const { return StringRef(Start.Pointer, ByteLength); }
 
-  /// Return the length of this valid range in bytes.  Can be zero.
-  unsigned getByteLength() const {
-    assert(isValid() && "length does not make sense for an invalid range");
-    return ByteLength;
+  bool operator==(const CharSourceRange &other) const {
+    return Start == other.Start && ByteLength == other.ByteLength;
   }
-  
+  bool operator!=(const CharSourceRange &other) const {
+    return !operator==(other);
+  }
+
   /// Print out the CharSourceRange.  If the locations are in the same buffer
   /// as specified by LastBufferID, then we don't print the filename.  If not,
   /// we do print the filename, and then update LastBufferID with the BufferID
@@ -314,11 +324,11 @@ class CharSourceRange {
     unsigned Tmp = ~0U;
     print(OS, SM, Tmp, PrintText);
   }
-  
+
   SWIFT_DEBUG_DUMPER(dump(const SourceManager &SM));
-};
 
 #endif // #ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+};
 
 } // end namespace swift
 

include/swift/Bridging/ASTGen.h

@@ -32,7 +32,7 @@ void swift_ASTGen_addQueuedDiagnostic(
     swift::SourceLoc sourceLoc,
     BridgedStringRef categoryName,
     BridgedStringRef documentationPath,
-    const BridgedCharSourceRange *_Nullable highlightRanges,
+    const swift::CharSourceRange *_Nullable highlightRanges,
     ptrdiff_t numHighlightRanges,
     BridgedArrayRef /*BridgedFixIt*/ fixIts);
 void swift_ASTGen_renderSingleDiagnostic(

include/swift/IDE/IDEBridging.h

@@ -117,7 +117,7 @@ struct BridgedResolvedLoc {
   /// This consumes `labelRanges` by calling `takeUnbridged` on it.
   SWIFT_NAME(
       "init(range:labelRanges:firstTrailingLabel:labelType:isActive:context:)")
-  BridgedResolvedLoc(BridgedCharSourceRange range,
+  BridgedResolvedLoc(swift::CharSourceRange range,
                      BridgedCharSourceRangeVector labelRanges,
                      unsigned firstTrailingLabel, LabelRangeType labelType,
                      bool isActive, ResolvedLocContext context);

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -596,8 +596,8 @@ BridgedProjectedValuePropertyAttr_createParsed(BridgedASTContext cContext,
 
 BridgedRawDocCommentAttr
 BridgedRawDocCommentAttr_createParsed(BridgedASTContext cContext,
-                                      BridgedCharSourceRange cRange) {
-  return new (cContext.unbridged()) RawDocCommentAttr(cRange.unbridged());
+                                      CharSourceRange range) {
+  return new (cContext.unbridged()) RawDocCommentAttr(range);
 }
 
 BridgedRawLayoutAttr

lib/AST/DiagnosticBridge.cpp

@@ -38,13 +38,6 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
                                            info.FormatArgs);
   }
 
-  // Map the highlight ranges.
-  SmallVector<BridgedCharSourceRange, 2> highlightRanges;
-  for (const auto &range : info.Ranges) {
-    if (range.isValid())
-      highlightRanges.push_back(range);
-  }
-
   StringRef documentationPath = info.CategoryDocumentationURL;
 
   SmallVector<BridgedFixIt, 2> fixIts;
@@ -58,7 +51,7 @@ static void addQueueDiagnostic(void *queuedDiagnostics,
       info.Kind, info.Loc,
       info.Category,
       documentationPath,
-      highlightRanges.data(), highlightRanges.size(),
+      info.Ranges.data(), info.Ranges.size(),
       llvm::ArrayRef<BridgedFixIt>(fixIts));
 
   // TODO: A better way to do this would be to pass the notes as an

lib/ASTGen/Sources/ASTGen/ASTGen.swift

@@ -291,10 +291,10 @@ extension ASTGenVisitor {
     }
   }
 
-  /// Obtains bridged character source range.
+  /// Obtains a C++ character source range.
   @inline(__always)
-  func generateCharSourceRange(start: AbsolutePosition, length: SourceLength) -> BridgedCharSourceRange {
-    BridgedCharSourceRange(
+  func generateCharSourceRange(start: AbsolutePosition, length: SourceLength) -> CharSourceRange {
+    .init(
       start: SourceLoc(at: start, in: self.base),
       byteLength: UInt32(length.utf8Length)
     )