Don’t include vector in `BasicBridging.h

Author: ahoppen

include/swift/Basic/BasicBridging.h

@@ -25,7 +25,6 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <vector>
 #ifdef USED_IN_CPP_SOURCE
 // Workaround to avoid a compiler error because `cas::ObjectRef` is not defined
 // when including VirtualFileSystem.h
@@ -35,6 +34,7 @@
 #include "swift/Basic/SourceLoc.h"
 #include "llvm/ADT/StringRef.h"
 #include <string>
+#include <vector>
 #endif
 
 // FIXME: We ought to be importing '<swift/bridging>' instead.
@@ -346,26 +346,36 @@ BridgedCharSourceRange_byteLength(BridgedCharSourceRange range) {
 // MARK: std::vector<BridgedCharSourceRange>
 //===----------------------------------------------------------------------===//
 
-typedef std::vector<BridgedCharSourceRange> BridgedCharSourceRangeVector;
-
-/// Create an empty `std::vector<ResolvedLoc>`.
+/// An opaque, heap-allocated `std::vector<CharSourceRange>`.
 ///
-/// - Note: This can't be imported as an initializer on
-/// `BridgedResolvedLocVector`
-///   because initializers without any arguments aren't imported to Swift
-SWIFT_NAME("BridgedCharSourceRangeVector.empty()")
-BridgedCharSourceRangeVector BridgedCharSourceRangeVector_createEmpty();
+/// This type is manually memory managed. The creator of the object needs to
+/// ensure that `takeUnbridged` is called to free the memory.
+class BridgedCharSourceRangeVector {
+  /// Opaque pointer to `std::vector<CharSourceRange>`.
+  void *_Nonnull vector;
 
-/// Append the given `BridgedCharSourceRange` to `vector`.
-SWIFT_NAME("BridgedCharSourceRangeVector.push_back(self:_:)")
-void BridgedCharSourceRangeVector_push_back_BridgedCharSourceRange(
-    BridgedCharSourceRangeVector &vector, BridgedCharSourceRange range);
+public:
+  BridgedCharSourceRangeVector();
+
+  SWIFT_NAME("append(_:)")
+  void push_back(BridgedCharSourceRange range);
 
 #ifdef USED_IN_CPP_SOURCE
-/// Convert the `BridgedCharSourceRange` to a `CharSourceRange`.
-std::vector<swift::CharSourceRange> BridgedCharSourceRangeVector_unbridged(
-    const BridgedCharSourceRangeVector &vector);
+  /// Returns the `std::vector<swift::CharSourceRange>` that this
+  /// `BridgedCharSourceRangeVector` represents and frees the memory owned by
+  /// this `BridgedCharSourceRangeVector`.
+  ///
+  /// No operations should be called on `BridgedCharSourceRangeVector` after
+  /// `takeUnbridged` is called.
+  std::vector<swift::CharSourceRange> takeUnbridged() {
+    auto *vectorPtr =
+        static_cast<std::vector<swift::CharSourceRange> *>(vector);
+    std::vector<swift::CharSourceRange> unbridged = *vectorPtr;
+    delete vectorPtr;
+    return unbridged;
+  }
 #endif
+};
 
 //===----------------------------------------------------------------------===//
 // MARK: Plugins

lib/ASTGen/Sources/SwiftIDEUtilsBridging/NameMatcherBridging.swift

@@ -28,9 +28,9 @@ fileprivate extension BridgedCharSourceRange {
 
 fileprivate extension BridgedCharSourceRangeVector {
   init(from ranges: some Sequence<Range<AbsolutePosition>>, in sourceFile: ExportedSourceFile) {
-    self = .empty()
+    self = .init()
     for range in ranges {
-      self.push_back(BridgedCharSourceRange(from: range, in: sourceFile))
+      self.append(BridgedCharSourceRange(from: range, in: sourceFile))
     }
   }
 }
@@ -74,7 +74,7 @@ extension IDEBridging.ResolvedLoc {
     }
     self.init(
       range: BridgedCharSourceRange(from: resolvedLoc.baseNameRange, in: sourceFile), 
-      labelRanges: BridgedCharSourceRangeVector(from: arguments.map { $0.range }, in: sourceFile), 
+      labelRanges: BridgedCharSourceRangeVector(from: arguments.map { $0.range }, in: sourceFile),
       firstTrailingLabel: firstTrailingClosureIndex,
       labelType: LabelRangeType(resolvedLoc.arguments), 
       isActive: resolvedLoc.isActive, 

lib/Basic/BasicBridging.cpp

@@ -58,30 +58,17 @@ void BridgedData_free(BridgedData data) {
 }
 
 //===----------------------------------------------------------------------===//
-// MARK: std::vector<CharSourceRange>
+// MARK: BridgedCharSourceRangeVector
 //===----------------------------------------------------------------------===//
 
-BridgedCharSourceRangeVector BridgedCharSourceRangeVector_createEmpty() {
-  return BridgedCharSourceRangeVector();
-}
+BridgedCharSourceRangeVector::BridgedCharSourceRangeVector()
+    : vector(new std::vector<CharSourceRange>()) {}
 
-void BridgedCharSourceRangeVector_push_back_BridgedCharSourceRange(
-    BridgedCharSourceRangeVector &vector, BridgedCharSourceRange range) {
-  vector.push_back(range);
+void BridgedCharSourceRangeVector::push_back(BridgedCharSourceRange range) {
+  static_cast<std::vector<CharSourceRange> *>(vector)->push_back(
+      range.unbridged());
 }
 
-#ifdef USED_IN_CPP_SOURCE
-std::vector<swift::CharSourceRange> BridgedCharSourceRangeVector_unbridged(
-    const BridgedCharSourceRangeVector &vector) {
-  std::vector<swift::CharSourceRange> unbridged;
-  unbridged.reserve(vector.size());
-  for (auto bridgedCharSourceRange : vector) {
-    unbridged.push_back(bridgedCharSourceRange.unbridged());
-  }
-  return unbridged;
-}
-#endif
-
 //===----------------------------------------------------------------------===//
 // MARK: JSON
 //===----------------------------------------------------------------------===//

lib/IDE/IDEBridging.cpp

@@ -18,8 +18,7 @@ ResolvedLoc::ResolvedLoc(BridgedCharSourceRange range,
                          BridgedCharSourceRangeVector labelRanges,
                          unsigned firstTrailingLabel, LabelRangeType labelType,
                          bool isActive, ResolvedLocContext context)
-    : range(range.unbridged()),
-      labelRanges(BridgedCharSourceRangeVector_unbridged(labelRanges)),
+    : range(range.unbridged()), labelRanges(labelRanges.takeUnbridged()),
       firstTrailingLabel(firstTrailingLabel == UINT_MAX
                              ? llvm::None
                              : llvm::Optional<unsigned>(firstTrailingLabel)),