Merge pull request #79168 from rintaro/astgen-tweaks

rintaro · web-flow · commit ac2603cad654 · 2025-02-05T16:48:35.000-08:00
[ASTGen] Small followup tweaks after AvailableAttr
diff --git a/SwiftCompilerSources/Sources/Basic/Utils.swift b/SwiftCompilerSources/Sources/Basic/Utils.swift
@@ -173,7 +173,7 @@ extension Optional where Wrapped == UnsafeMutablePointer<BridgedSwiftObject> {
 
 extension BridgedArrayRef {
   public func withElements<T, R>(ofType ty: T.Type, _ c: (UnsafeBufferPointer<T>) -> R) -> R {
-    let start = data?.bindMemory(to: ty, capacity: count)
+    let start = data?.assumingMemoryBound(to: ty)
     let buffer = UnsafeBufferPointer(start: start, count: count)
     return c(buffer)
   }
diff --git a/include/swift/AST/ParseRequests.h b/include/swift/AST/ParseRequests.h
@@ -196,7 +196,7 @@ class EvaluateIfConditionRequest
 /// Parse the '-define-availability' arguments.
 class AvailabilityMacroArgumentsRequest
     : public SimpleRequest<AvailabilityMacroArgumentsRequest,
-                           AvailabilityMacroMap *(ASTContext *),
+                           const AvailabilityMacroMap *(ASTContext *),
                            RequestFlags::Cached> {
 public:
   using SimpleRequest::SimpleRequest;
@@ -205,7 +205,8 @@ class AvailabilityMacroArgumentsRequest
   friend SimpleRequest;
 
   // Evaluation.
-  AvailabilityMacroMap *evaluate(Evaluator &evaluator, ASTContext *ctx) const;
+  const AvailabilityMacroMap *evaluate(Evaluator &evaluator,
+                                       ASTContext *ctx) const;
 
 public:
   // Caching.
diff --git a/include/swift/AST/ParseTypeIDZone.def b/include/swift/AST/ParseTypeIDZone.def
@@ -35,5 +35,5 @@ SWIFT_REQUEST(Parse, EvaluateIfConditionRequest,
               (std::pair<bool, bool>)(SourceFile *, SourceRange, bool), Uncached,
               NoLocationInfo)
 SWIFT_REQUEST(Parse, AvailabilityMacroArgumentsRequest,
-              (AvailabilityMacroMap *)(ASTContext *), Cached,
+              (const AvailabilityMacroMap *)(ASTContext *), Cached,
               NoLocationInfo)
diff --git a/include/swift/Basic/BasicBridging.h b/include/swift/Basic/BasicBridging.h
@@ -172,13 +172,13 @@ class BridgedArrayRef {
 
 SWIFT_NAME("getter:BridgedArrayRef.data(self:)")
 BRIDGED_INLINE
-const void *_Nullable BridgedArrayRef_data(const BridgedArrayRef arr);
+const void *_Nullable BridgedArrayRef_data(BridgedArrayRef arr);
 
 SWIFT_NAME("getter:BridgedArrayRef.count(self:)")
-BRIDGED_INLINE SwiftInt BridgedArrayRef_count(const BridgedArrayRef arr);
+BRIDGED_INLINE SwiftInt BridgedArrayRef_count(BridgedArrayRef arr);
 
 SWIFT_NAME("getter:BridgedArrayRef.isEmpty(self:)")
-BRIDGED_INLINE bool BridgedArrayRef_isEmpty(const BridgedArrayRef arr);
+BRIDGED_INLINE bool BridgedArrayRef_isEmpty(BridgedArrayRef arr);
 
 //===----------------------------------------------------------------------===//
 // MARK: Data
diff --git a/include/swift/Basic/BasicBridgingImpl.h b/include/swift/Basic/BasicBridgingImpl.h
@@ -23,15 +23,15 @@ SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
 // MARK: BridgedArrayRef
 //===----------------------------------------------------------------------===//
 
-const void *_Nullable BridgedArrayRef_data(const BridgedArrayRef arr) {
+const void *_Nullable BridgedArrayRef_data(BridgedArrayRef arr) {
   return arr.Data;
 }
 
-SwiftInt BridgedArrayRef_count(const BridgedArrayRef arr) {
+SwiftInt BridgedArrayRef_count(BridgedArrayRef arr) {
   return static_cast<SwiftInt>(arr.Length);
 }
 
-bool BridgedArrayRef_isEmpty(const BridgedArrayRef arr) {
+bool BridgedArrayRef_isEmpty(BridgedArrayRef arr) {
   return arr.Length == 0;
 }
 
diff --git a/lib/ASTGen/Sources/ASTGen/Availability.swift b/lib/ASTGen/Sources/ASTGen/Availability.swift
@@ -1,4 +1,4 @@
-//===--- Attrs.swift ------------------------------------------------------===//
+//===--- Availability.swift -----------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/lib/ASTGen/Sources/ASTGen/Bridge.swift b/lib/ASTGen/Sources/ASTGen/Bridge.swift
@@ -313,7 +313,7 @@ extension ConcatCollection: LazyCollectionProtocol {
 
 extension BridgedArrayRef {
   public func withElements<T, R>(ofType ty: T.Type, _ c: (UnsafeBufferPointer<T>) -> R) -> R {
-    let start = data?.bindMemory(to: ty, capacity: count)
+    let start = data?.assumingMemoryBound(to: ty)
     let buffer = UnsafeBufferPointer(start: start, count: count)
     return c(buffer)
   }
diff --git a/lib/ASTGen/Sources/ASTGen/DeclAttrs.swift b/lib/ASTGen/Sources/ASTGen/DeclAttrs.swift
@@ -1,4 +1,4 @@
-//===--- Attrs.swift ------------------------------------------------------===//
+//===--- DeclAttrs.swift --------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/lib/ASTGen/Sources/ASTGen/Diagnostics.swift b/lib/ASTGen/Sources/ASTGen/Diagnostics.swift
@@ -1,4 +1,4 @@
-//===----------------------------------------------------------------------===//
+//===--- Diagnostics.swift ------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/lib/ASTGen/Sources/ASTGen/ParameterClause.swift b/lib/ASTGen/Sources/ASTGen/ParameterClause.swift
@@ -1,4 +1,4 @@
-//===----------------------------------------------------------------------===//
+//===--- ParameterClause.swift --------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/lib/ASTGen/Sources/ASTGen/Regex.swift b/lib/ASTGen/Sources/ASTGen/Regex.swift
@@ -1,4 +1,4 @@
-//===--- Regex.swift - SourceLoc bridiging utilities ------------------===//
+//===--- Regex.swift ------------------------------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
diff --git a/lib/Parse/ParseRequests.cpp b/lib/Parse/ParseRequests.cpp
@@ -591,7 +591,7 @@ bool parseAvailabilityMacroDefinition(
 
 } // namespace
 
-AvailabilityMacroMap *
+const AvailabilityMacroMap *
 AvailabilityMacroArgumentsRequest::evaluate(Evaluator &evaluator,
                                             ASTContext *ctx) const {
   SourceManager &SM = ctx->SourceMgr;

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ extension Optional where Wrapped == UnsafeMutablePointer<BridgedSwiftObject> {`
`173`	`173`
`174`	`174`	`extension BridgedArrayRef {`
`175`	`175`	`public func withElements<T, R>(ofType ty: T.Type, _ c: (UnsafeBufferPointer<T>) -> R) -> R {`
`176`		`- let start = data?.bindMemory(to: ty, capacity: count)`
	`176`	`+ let start = data?.assumingMemoryBound(to: ty)`
`177`	`177`	`let buffer = UnsafeBufferPointer(start: start, count: count)`
`178`	`178`	`return c(buffer)`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,15 @@ SWIFT_BEGIN_NULLABILITY_ANNOTATIONS`
`23`	`23`	`// MARK: BridgedArrayRef`
`24`	`24`	`//===----------------------------------------------------------------------===//`
`25`	`25`
`26`		`-const void *_Nullable BridgedArrayRef_data(const BridgedArrayRef arr) {`
	`26`	`+const void *_Nullable BridgedArrayRef_data(BridgedArrayRef arr) {`
`27`	`27`	`return arr.Data;`
`28`	`28`	`}`
`29`	`29`
`30`		`-SwiftInt BridgedArrayRef_count(const BridgedArrayRef arr) {`
	`30`	`+SwiftInt BridgedArrayRef_count(BridgedArrayRef arr) {`
`31`	`31`	`return static_cast<SwiftInt>(arr.Length);`
`32`	`32`	`}`
`33`	`33`
`34`		`-bool BridgedArrayRef_isEmpty(const BridgedArrayRef arr) {`
	`34`	`+bool BridgedArrayRef_isEmpty(BridgedArrayRef arr) {`
`35`	`35`	`return arr.Length == 0;`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//===--- Attrs.swift ------------------------------------------------------===//`
	`1`	`+//===--- Availability.swift -----------------------------------------------===//`
`2`	`2`	`//`
`3`	`3`	`// This source file is part of the Swift.org open source project`
`4`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ extension ConcatCollection: LazyCollectionProtocol {`
`313`	`313`
`314`	`314`	`extension BridgedArrayRef {`
`315`	`315`	`public func withElements<T, R>(ofType ty: T.Type, _ c: (UnsafeBufferPointer<T>) -> R) -> R {`
`316`		`- let start = data?.bindMemory(to: ty, capacity: count)`
	`316`	`+ let start = data?.assumingMemoryBound(to: ty)`
`317`	`317`	`let buffer = UnsafeBufferPointer(start: start, count: count)`
`318`	`318`	`return c(buffer)`
`319`	`319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//===--- Attrs.swift ------------------------------------------------------===//`
	`1`	`+//===--- DeclAttrs.swift --------------------------------------------------===//`
`2`	`2`	`//`
`3`	`3`	`// This source file is part of the Swift.org open source project`
`4`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//===----------------------------------------------------------------------===//`
	`1`	`+//===--- Diagnostics.swift ------------------------------------------------===//`
`2`	`2`	`//`
`3`	`3`	`// This source file is part of the Swift.org open source project`
`4`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//===----------------------------------------------------------------------===//`
	`1`	`+//===--- ParameterClause.swift --------------------------------------------===//`
`2`	`2`	`//`
`3`	`3`	`// This source file is part of the Swift.org open source project`
`4`	`4`	`//`