Incorporate feedback removing version field

Author: grynspan

Documentation/ABI/TestContent.md

@@ -46,8 +46,7 @@ testing library have the following layout:
 ```swift
 typealias TestContentRecord = (
   kind: UInt32,
-  version: UInt16,
-  reserved1: UInt16,
+  reserved1: UInt32,
   accessor: (@convention(c) (_ outValue: UnsafeMutableRawPointer, _ hint: UnsafeRawPointer?) -> CBool)?,
   context: UInt,
   reserved2: UInt
@@ -60,8 +59,7 @@ If needed, this type can be represented in C as a structure:
 ```c
 struct SWTTestContentRecord {
   uint32_t kind;
-  uint16_t version;
-  uint16_t reserved1;
+  uint32_t reserved1;
   bool (* _Nullable accessor)(void *outValue, const void *_Null_unspecified hint);
   uintptr_t context;
   uintptr_t reserved2;
@@ -84,11 +82,6 @@ record's kind is a 32-bit unsigned value. The following kinds are defined:
 <!-- When adding cases to this enumeration, be sure to also update the
 corresponding enumeration in TestContentGeneration.swift. -->
 
-#### The version field
-
-This field is currently always `0`. Implementations should ignore structures
-with other version values.
-
 #### The accessor field
 
 The function `accessor` is a C function. When called, it initializes the memory

Sources/Testing/Discovery.swift

@@ -14,7 +14,6 @@ private import _TestingInternals
 ///
 /// - Parameters:
 ///   - kind: The kind of this record.
-///   - version: The version of this record.
 ///   - reserved1: Reserved for future use.
 ///   - accessor: A function which, when called, produces the test content.
 ///   - context: Kind-specific context for this record.
@@ -24,16 +23,12 @@ private import _TestingInternals
 ///   directly.
 public typealias __TestContentRecord = (
   kind: UInt32,
-  version: UInt16,
-  reserved1: UInt16,
+  reserved1: UInt32,
   accessor: (@convention(c) (_ outValue: UnsafeMutableRawPointer, _ hint: UnsafeRawPointer?) -> CBool)?,
   context: UInt,
   reserved2: UInt
 )
 
-/// The current version of the `__TestContentRecord` type.
-private let _currentTestContentRecordVersion = UInt16(0)
-
 /// Resign any pointers in a test content record.
 ///
 /// - Parameters:
@@ -98,24 +93,12 @@ extension TestContent where Self: ~Copyable {
   private static func _testContentRecords(in sectionBounds: SectionBounds) -> some Sequence<(imageAddress: UnsafeRawPointer?, record: __TestContentRecord)> {
     sectionBounds.buffer.withMemoryRebound(to: __TestContentRecord.self) { records in
       records.lazy
-        .filter { $0.version == _currentTestContentRecordVersion }
         .filter { $0.kind == testContentKind }
         .map(_resign)
         .map { (sectionBounds.imageAddress, $0) }
     }
   }
 
-  /// Enumerate all test content records found in all test content sections in
-  /// the current process that match this ``TestContent`` type.
-  ///
-  /// - Returns: A sequence of tuples. Each tuple contains an instance of
-  ///   `__TestContentRecord` and the base address of the image containing that
-  ///   test content record. Only test content records matching this
-  ///   ``TestContent`` type's requirements are included in the sequence.
-  private static func _testContentRecords() -> some Sequence<(imageAddress: UnsafeRawPointer?, record: __TestContentRecord)> {
-    SectionBounds.allTestContent.lazy.flatMap(_testContentRecords(in:))
-  }
-
   /// Call the given accessor function.
   ///
   /// - Parameters:
@@ -177,8 +160,10 @@ extension TestContent where Self: ~Copyable {
   /// is used with move-only types (specifically ``ExitTest``) and
   /// `Sequence.Element` must be copyable.
   static func enumerateTestContent(withHint hint: TestContentAccessorHint? = nil, _ body: TestContentEnumerator) {
+    let testContentRecords = SectionBounds.allTestContent.lazy.flatMap(_testContentRecords(in:))
+
     var stop = false
-    for (imageAddress, record) in _testContentRecords() {
+    for (imageAddress, record) in testContentRecords {
       if let accessor = record.accessor, let result = _callAccessor(accessor, withHint: hint) {
         // Call the callback.
         body(imageAddress, result, record.context, &stop)

Sources/TestingMacros/Support/TestContentGeneration.swift

@@ -82,7 +82,6 @@ func makeTestContentRecordDecl(named name: TokenSyntax, in typeName: TypeSyntax?
   private \(staticKeyword(for: typeName)) let \(name): Testing.__TestContentRecord = (
     \(kindExpr),\(kindComment)
     0,
-    0,
     \(accessorName),
     \(contextExpr),
     0