Don’t include SourceLoc.h when USED_IN_CPP_SOURCE is not set

Author: ahoppen

include/swift/Basic/BasicBridging.h

@@ -22,16 +22,15 @@
 //
 #include "swift/Basic/BridgedSwiftObject.h"
 #include "swift/Basic/Compiler.h"
-#include "swift/Basic/SourceLoc.h"
-// Workaround to avoid a compiler error because `cas::ObjectRef` is not defined
-// when including VirtualFileSystem.h
-#include "llvm/CAS/CASReference.h"
 
 #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
 #include <cassert>
+#include "llvm/CAS/CASReference.h"
 
 #include "swift/Basic/SourceLoc.h"
 #include "llvm/ADT/StringRef.h"
@@ -306,7 +305,7 @@ class BridgedSourceRange {
 };
 
 //===----------------------------------------------------------------------===//
-// MARK: CharSourceRange
+// MARK: BridgedCharSourceRange
 //===----------------------------------------------------------------------===//
 
 class BridgedCharSourceRange {
@@ -344,24 +343,29 @@ BridgedCharSourceRange_byteLength(BridgedCharSourceRange range) {
 }
 
 //===----------------------------------------------------------------------===//
-// MARK: std::vector<CharSourceRange>
+// MARK: std::vector<BridgedCharSourceRange>
 //===----------------------------------------------------------------------===//
 
-typedef std::vector<swift::CharSourceRange> CharSourceRangeVector;
+typedef std::vector<BridgedCharSourceRange> BridgedCharSourceRangeVector;
 
 /// Create an empty `std::vector<ResolvedLoc>`.
 ///
 /// - Note: This can't be imported as an initializer on
 /// `BridgedResolvedLocVector`
 ///   because initializers without any arguments aren't imported to Swift
-SWIFT_NAME("CharSourceRangeVector.empty()")
-CharSourceRangeVector CharSourceRangeVector_createEmpty();
-
-/// Convert the `BridgedCharSourceRange` to a `CharSourceRange` and append it
-/// to `vector`.
-SWIFT_NAME("CharSourceRangeVector.push_back(self:_:)")
-void CharSourceRangeVector_push_back_BridgedCharSourceRange(
-    CharSourceRangeVector &vector, BridgedCharSourceRange range);
+SWIFT_NAME("BridgedCharSourceRangeVector.empty()")
+BridgedCharSourceRangeVector BridgedCharSourceRangeVector_createEmpty();
+
+/// Append the given `BridgedCharSourceRange` to `vector`.
+SWIFT_NAME("BridgedCharSourceRangeVector.push_back(self:_:)")
+void BridgedCharSourceRangeVector_push_back_BridgedCharSourceRange(
+    BridgedCharSourceRangeVector &vector, BridgedCharSourceRange range);
+
+#ifdef USED_IN_CPP_SOURCE
+/// Convert the `BridgedCharSourceRange` to a `CharSourceRange`.
+std::vector<swift::CharSourceRange> BridgedCharSourceRangeVector_unbridged(
+    const BridgedCharSourceRangeVector &vector);
+#endif
 
 //===----------------------------------------------------------------------===//
 // MARK: Plugins

include/swift/IDE/IDEBridging.h

@@ -67,7 +67,8 @@ struct ResolvedLoc {
 
   SWIFT_NAME(
       "init(range:labelRanges:firstTrailingLabel:labelType:isActive:context:)")
-  ResolvedLoc(BridgedCharSourceRange range, CharSourceRangeVector labelRanges,
+  ResolvedLoc(BridgedCharSourceRange range,
+              BridgedCharSourceRangeVector labelRanges,
               unsigned firstTrailingLabel, LabelRangeType labelType,
               bool isActive, ResolvedLocContext context);
 

include/swift/SILOptimizer/OptimizerBridging.h

@@ -24,6 +24,15 @@
 
 #include "swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h"
 
+#else // USED_IN_CPP_SOURCE
+
+#ifdef SWIFT_SIL_SILVALUE_H
+#error "should not include swift headers into bridging header"
+#endif
+#ifdef LLVM_SUPPORT_COMPILER_H
+#error "should not include llvm headers into bridging header"
+#endif
+
 #endif // USED_IN_CPP_SOURCE
 
 SWIFT_BEGIN_NULLABILITY_ANNOTATIONS

lib/ASTGen/Sources/SwiftIDEUtilsBridging/NameMatcherBridging.swift

@@ -26,7 +26,7 @@ fileprivate extension BridgedCharSourceRange {
   }
 }
 
-fileprivate extension CharSourceRangeVector {
+fileprivate extension BridgedCharSourceRangeVector {
   init(from ranges: some Sequence<Range<AbsolutePosition>>, in sourceFile: ExportedSourceFile) {
     self = .empty()
     for range in ranges {
@@ -74,7 +74,7 @@ extension IDEBridging.ResolvedLoc {
     }
     self.init(
       range: BridgedCharSourceRange(from: resolvedLoc.baseNameRange, in: sourceFile), 
-      labelRanges: CharSourceRangeVector(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

@@ -61,15 +61,27 @@ void BridgedData_free(BridgedData data) {
 // MARK: std::vector<CharSourceRange>
 //===----------------------------------------------------------------------===//
 
-CharSourceRangeVector CharSourceRangeVector_createEmpty() {
-  return CharSourceRangeVector();
+BridgedCharSourceRangeVector BridgedCharSourceRangeVector_createEmpty() {
+  return BridgedCharSourceRangeVector();
 }
 
-void CharSourceRangeVector_push_back_BridgedCharSourceRange(
-    CharSourceRangeVector &vector, BridgedCharSourceRange range) {
-  vector.push_back(range.unbridged());
+void BridgedCharSourceRangeVector_push_back_BridgedCharSourceRange(
+    BridgedCharSourceRangeVector &vector, BridgedCharSourceRange range) {
+  vector.push_back(range);
 }
 
+#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

@@ -15,10 +15,11 @@
 #include <climits>
 
 ResolvedLoc::ResolvedLoc(BridgedCharSourceRange range,
-                         CharSourceRangeVector labelRanges,
+                         BridgedCharSourceRangeVector labelRanges,
                          unsigned firstTrailingLabel, LabelRangeType labelType,
                          bool isActive, ResolvedLocContext context)
-    : range(range.unbridged()), labelRanges(labelRanges),
+    : range(range.unbridged()),
+      labelRanges(BridgedCharSourceRangeVector_unbridged(labelRanges)),
       firstTrailingLabel(firstTrailingLabel == UINT_MAX
                              ? llvm::None
                              : llvm::Optional<unsigned>(firstTrailingLabel)),