Address review feedback

Author: hamishknight

SwiftCompilerSources/Package.swift

@@ -58,6 +58,9 @@ private extension Target {
 let package = Package(
   name: "SwiftCompilerSources",
   platforms: [
+    // We need at least macOS 13 here to avoid hitting an availability error
+    // for CxxStdlib. It's only needed for the package though, the CMake build
+    // works fine with a lower deployment target.
     .macOS(.v13),
   ],
   products: [

include/swift/AST/ASTBridging.h

@@ -927,8 +927,9 @@ SWIFT_END_ASSUME_NONNULL
 SWIFT_END_NULLABILITY_ANNOTATIONS
 
 #ifndef PURE_BRIDGING_MODE
-// In _not_ PURE_BRIDGING_MODE, briding functions are inlined and therefore
-// included in the header file.
+// In _not_ PURE_BRIDGING_MODE, bridging functions are inlined and therefore
+// included in the header file. This is because they rely on C++ headers that
+// we don't want to pull in when using "pure bridging mode".
 #include "ASTBridgingImpl.h"
 #endif
 

include/swift/Basic/BasicBridging.h

@@ -36,7 +36,7 @@
 #include <string>
 #endif
 
-// FIXME: We ought to be importing '<swift/briging>' instead.
+// FIXME: We ought to be importing '<swift/bridging>' instead.
 #if __has_attribute(swift_name)
 #define SWIFT_NAME(NAME) __attribute__((swift_name(NAME)))
 #else
@@ -273,7 +273,7 @@ class BridgedSourceLoc {
 };
 
 SWIFT_NAME("getter:BridgedSourceLoc.isValid(self:)")
-BRIDGED_INLINE bool BridgedSourceLoc_isValid(BridgedSourceLoc str);
+BRIDGED_INLINE bool BridgedSourceLoc_isValid(BridgedSourceLoc loc);
 
 //===----------------------------------------------------------------------===//
 // MARK: SourceRange
@@ -359,7 +359,8 @@ SWIFT_END_NULLABILITY_ANNOTATIONS
 
 #ifndef PURE_BRIDGING_MODE
 // In _not_ PURE_BRIDGING_MODE, bridging functions are inlined and therefore
-// included in the header file.
+// included in the header file. This is because they rely on C++ headers that
+// we don't want to pull in when using "pure bridging mode".
 #include "BasicBridgingImpl.h"
 #endif
 

include/swift/Basic/BasicBridgingImpl.h

@@ -74,8 +74,8 @@ bool BridgedOwnedString_empty(BridgedOwnedString str) {
 // MARK: BridgedSourceLoc
 //===----------------------------------------------------------------------===//
 
-bool BridgedSourceLoc_isValid(BridgedSourceLoc str) {
-  return str.getOpaquePointerValue() != nullptr;
+bool BridgedSourceLoc_isValid(BridgedSourceLoc loc) {
+  return loc.getOpaquePointerValue() != nullptr;
 }
 
 BridgedSourceLoc BridgedSourceLoc::advancedBy(size_t n) const {

include/swift/SIL/SILBridging.h

@@ -992,7 +992,9 @@ void writeCharToStderr(int c);
 SWIFT_END_NULLABILITY_ANNOTATIONS
 
 #ifndef PURE_BRIDGING_MODE
-// In _not_ PURE_BRIDGING_MODE, briding functions are inlined and therefore inluded in the header file.
+// In _not_ PURE_BRIDGING_MODE, bridging functions are inlined and therefore
+// included in the header file. This is because they rely on C++ headers that
+// we don't want to pull in when using "pure bridging mode".
 #include "SILBridgingImpl.h"
 #endif
 

lib/ASTGen/Package.swift

@@ -37,6 +37,9 @@ let swiftSetttings: [SwiftSetting] = [
 let package = Package(
   name: "swiftSwiftCompiler",
   platforms: [
+    // We need at least macOS 13 here to avoid hitting an availability error
+    // for CxxStdlib. It's only needed for the package though, the CMake build
+    // works fine with a lower deployment target.
     .macOS(.v13)
   ],
   products: [