Merge pull request #82 from lorentey/finalize-1.1

lorentey · web-flow · commit 62876240024d · 2023-03-31T15:26:12.000-07:00
1.1 release preparations
diff --git a/Sources/Atomics/AtomicLazyReference.swift.gyb b/Sources/Atomics/AtomicLazyReference.swift.gyb
@@ -139,6 +139,10 @@ public class ManagedAtomicLazyReference<Instance: AnyObject> {
   @usableFromInline
   internal typealias _Rep = Optional<Unmanaged<Instance>>.AtomicRepresentation
 
+  /// The atomic representation of the value stored inside.
+  ///
+  /// Warning: This ivar must only ever be accessed via `_ptr` after
+  /// its initialization.
   @usableFromInline
   internal let _storage: _Rep
 
@@ -149,7 +153,7 @@ public class ManagedAtomicLazyReference<Instance: AnyObject> {
   }
 
   deinit {
-    if let unmanaged = _storage.dispose() {
+    if let unmanaged = _ptr.pointee.dispose() {
       unmanaged.release()
     }
   }
diff --git a/Sources/Atomics/HighLevelTypes.swift.gyb b/Sources/Atomics/HighLevelTypes.swift.gyb
@@ -97,6 +97,10 @@ where Value.AtomicRepresentation.Value == Value {
   @usableFromInline
   internal typealias _Storage = Value.AtomicRepresentation
 
+  /// The atomic representation of the value stored inside.
+  ///
+  /// Warning: This ivar must only ever be accessed via `_ptr` after
+  /// its initialization.
   @usableFromInline
   internal var _storage: _Storage
 
@@ -108,7 +112,7 @@ where Value.AtomicRepresentation.Value == Value {
   }
 
   deinit {
-    _ = _storage.dispose()
+    _ = _ptr.pointee.dispose()
   }
 
   @_alwaysEmitIntoClient @inline(__always)
diff --git a/Sources/Atomics/autogenerated/AtomicLazyReference.swift b/Sources/Atomics/autogenerated/AtomicLazyReference.swift
@@ -142,6 +142,10 @@ public class ManagedAtomicLazyReference<Instance: AnyObject> {
   @usableFromInline
   internal typealias _Rep = Optional<Unmanaged<Instance>>.AtomicRepresentation
 
+  /// The atomic representation of the value stored inside.
+  ///
+  /// Warning: This ivar must only ever be accessed via `_ptr` after
+  /// its initialization.
   @usableFromInline
   internal let _storage: _Rep
 
@@ -152,7 +156,7 @@ public class ManagedAtomicLazyReference<Instance: AnyObject> {
   }
 
   deinit {
-    if let unmanaged = _storage.dispose() {
+    if let unmanaged = _ptr.pointee.dispose() {
       unmanaged.release()
     }
   }
diff --git a/Sources/Atomics/autogenerated/HighLevelTypes.swift b/Sources/Atomics/autogenerated/HighLevelTypes.swift
@@ -99,6 +99,10 @@ where Value.AtomicRepresentation.Value == Value {
   @usableFromInline
   internal typealias _Storage = Value.AtomicRepresentation
 
+  /// The atomic representation of the value stored inside.
+  ///
+  /// Warning: This ivar must only ever be accessed via `_ptr` after
+  /// its initialization.
   @usableFromInline
   internal var _storage: _Storage
 
@@ -110,7 +114,7 @@ where Value.AtomicRepresentation.Value == Value {
   }
 
   deinit {
-    _ = _storage.dispose()
+    _ = _ptr.pointee.dispose()
   }
 
   @_alwaysEmitIntoClient @inline(__always)
diff --git a/Tests/AtomicsTests/AtomicLazyReference.swift b/Tests/AtomicsTests/AtomicLazyReference.swift
@@ -15,12 +15,17 @@ import Atomics
 
 class AtomicLazyReferenceTests: XCTestCase {
   func test_unsafe_create_destroy() {
+    XCTAssertEqual(LifetimeTracked.instances, 0)
     let v = UnsafeAtomicLazyReference<LifetimeTracked>.create()
-    defer { v.destroy() }
+    defer {
+      v.destroy()
+      XCTAssertEqual(LifetimeTracked.instances, 0)
+    }
     XCTAssertNil(v.load())
   }
 
   func test_unsafe_storeIfNilThenLoad() {
+    XCTAssertEqual(LifetimeTracked.instances, 0)
     do {
       let v = UnsafeAtomicLazyReference<LifetimeTracked>.create()
       XCTAssertNil(v.load())
@@ -39,6 +44,7 @@ class AtomicLazyReferenceTests: XCTestCase {
   }
 
   func test_managed_storeIfNilThenLoad() {
+    XCTAssertEqual(LifetimeTracked.instances, 0)
     do {
       let v = ManagedAtomicLazyReference<LifetimeTracked>()
       XCTAssertNil(v.load())
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
@@ -14,6 +14,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) # FIXME Hook this up on Darwin
 
   add_executable(AtomicsTestBundle
     AtomicsTests/main.swift
+    AtomicsTests/AtomicLazyReference.swift
     AtomicsTests/Basics/BasicTestSupport.swift
     AtomicsTests/Basics/autogenerated/BasicAtomicBoolTests.swift
     AtomicsTests/Basics/autogenerated/BasicAtomicDoubleWordTests.swift
@@ -46,7 +47,8 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) # FIXME Hook this up on Darwin
     AtomicsTests/LockFreeQueue.swift
     AtomicsTests/LockFreeSingleConsumerStack.swift
     AtomicsTests/StrongReferenceRace.swift
-    AtomicsTests/StrongReferenceShuffle.swift)
+    AtomicsTests/StrongReferenceShuffle.swift
+    AtomicsTests/StrongReferenceSubclass.swift)
 
   target_compile_options(AtomicsTestBundle PRIVATE "-DMANUAL_TEST_DISCOVERY")
 
diff --git a/Xcode/Atomics.xcodeproj/project.pbxproj b/Xcode/Atomics.xcodeproj/project.pbxproj
@@ -182,16 +182,15 @@
 		7D489ECD29CE96DA00499B21 /* gyb_utils.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = gyb_utils.py; sourceTree = "<group>"; };
 		7D489ECE29CE96DA00499B21 /* gyb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gyb; sourceTree = "<group>"; };
 		7D489ECF29CE96DA00499B21 /* generate-sources.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "generate-sources.sh"; sourceTree = "<group>"; };
-		7D489ED029CE96DA00499B21 /* generate-docs.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "generate-docs.sh"; sourceTree = "<group>"; };
 		7D489ED129CE96DA00499B21 /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE.txt; path = ../LICENSE.txt; sourceTree = "<group>"; };
-		7D489ED329CE96DA00499B21 /* Atomics.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Atomics.xcodeproj; sourceTree = "<group>"; };
 		7D489ED629CE96DA00499B21 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		7D489ED729CE96DA00499B21 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ../README.md; sourceTree = "<group>"; };
 		7D489ED829CE96DA00499B21 /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = CONTRIBUTING.md; path = ../CONTRIBUTING.md; sourceTree = "<group>"; };
 		7D489ED929CE96DA00499B21 /* CODE_OF_CONDUCT.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; name = CODE_OF_CONDUCT.md; path = ../CODE_OF_CONDUCT.md; sourceTree = "<group>"; };
 		7D489F6F29CE986A00499B21 /* Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Shared.xcconfig; sourceTree = "<group>"; };
 		7D489F7029CE986A00499B21 /* Atomics.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Atomics.xcconfig; sourceTree = "<group>"; };
 		7D489F7129CE986A00499B21 /* AtomicsTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AtomicsTests.xcconfig; sourceTree = "<group>"; };
+		BB63DC6A29D782010054E9C2 /* Atomics.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Atomics.xctestplan; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -441,7 +440,6 @@
 				7D489ECD29CE96DA00499B21 /* gyb_utils.py */,
 				7D489ECE29CE96DA00499B21 /* gyb */,
 				7D489ECF29CE96DA00499B21 /* generate-sources.sh */,
-				7D489ED029CE96DA00499B21 /* generate-docs.sh */,
 			);
 			name = Utilities;
 			path = ../Utilities;
@@ -450,20 +448,15 @@
 		7D489ED229CE96DA00499B21 /* Xcode */ = {
 			isa = PBXGroup;
 			children = (
+				BB63DC6A29D782010054E9C2 /* Atomics.xctestplan */,
 				7D489F6F29CE986A00499B21 /* Shared.xcconfig */,
 				7D489F7029CE986A00499B21 /* Atomics.xcconfig */,
 				7D489F7129CE986A00499B21 /* AtomicsTests.xcconfig */,
-				7D489ED329CE96DA00499B21 /* Atomics.xcodeproj */,
 				7D489ED629CE96DA00499B21 /* README.md */,
 			);
 			name = Xcode;
 			sourceTree = "<group>";
 		};
-		7D489ED429CE96DA00499B21 /* Products */ = {
-			isa = PBXGroup;
-			name = Products;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -544,12 +537,6 @@
 			mainGroup = 7D489E3529CE969D00499B21;
 			productRefGroup = 7D489E4029CE969D00499B21 /* Products */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 7D489ED429CE96DA00499B21 /* Products */;
-					ProjectRef = 7D489ED329CE96DA00499B21 /* Atomics.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				7D489E3E29CE969D00499B21 /* Atomics */,
diff --git a/Xcode/Atomics.xcodeproj/xcshareddata/xcschemes/Atomics.xcscheme b/Xcode/Atomics.xcodeproj/xcshareddata/xcschemes/Atomics.xcscheme
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1420"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7D489E3E29CE969D00499B21"
+               BuildableName = "Atomics.framework"
+               BlueprintName = "Atomics"
+               ReferencedContainer = "container:Atomics.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:Atomics.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+      <Testables>
+         <TestableReference
+            skipped = "NO"
+            parallelizable = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7D489E4629CE969D00499B21"
+               BuildableName = "AtomicsTests.xctest"
+               BlueprintName = "AtomicsTests"
+               ReferencedContainer = "container:Atomics.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "7D489E3E29CE969D00499B21"
+            BuildableName = "Atomics.framework"
+            BlueprintName = "Atomics"
+            ReferencedContainer = "container:Atomics.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Xcode/Atomics.xctestplan b/Xcode/Atomics.xctestplan
@@ -0,0 +1,32 @@
+{
+  "configurations" : [
+    {
+      "id" : "CF37E70B-D810-4CF2-AB41-571BAFF72572",
+      "name" : "Default",
+      "options" : {
+
+      }
+    },
+    {
+      "id" : "33436295-E24E-439B-9B8E-4602E0A6C8BB",
+      "name" : "TSan",
+      "options" : {
+        "threadSanitizerEnabled" : true
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : false
+  },
+  "testTargets" : [
+    {
+      "parallelizable" : true,
+      "target" : {
+        "containerPath" : "container:Atomics.xcodeproj",
+        "identifier" : "7D489E4629CE969D00499B21",
+        "name" : "AtomicsTests"
+      }
+    }
+  ],
+  "version" : 1
+}

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,10 @@ public class ManagedAtomicLazyReference<Instance: AnyObject> {`
`139`	`139`	`@usableFromInline`
`140`	`140`	`internal typealias _Rep = Optional<Unmanaged<Instance>>.AtomicRepresentation`
`141`	`141`
	`142`	`+ /// The atomic representation of the value stored inside.`
	`143`	`+ ///`
	`144`	+ /// Warning: This ivar must only ever be accessed via `_ptr` after
	`145`	`+ /// its initialization.`
`142`	`146`	`@usableFromInline`
`143`	`147`	`internal let _storage: _Rep`
`144`	`148`
`@@ -149,7 +153,7 @@ public class ManagedAtomicLazyReference<Instance: AnyObject> {`
`149`	`153`	`}`
`150`	`154`
`151`	`155`	`deinit {`
`152`		`- if let unmanaged = _storage.dispose() {`
	`156`	`+ if let unmanaged = _ptr.pointee.dispose() {`
`153`	`157`	`unmanaged.release()`
`154`	`158`	`}`
`155`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,10 @@ public class ManagedAtomicLazyReference<Instance: AnyObject> {`
`142`	`142`	`@usableFromInline`
`143`	`143`	`internal typealias _Rep = Optional<Unmanaged<Instance>>.AtomicRepresentation`
`144`	`144`
	`145`	`+ /// The atomic representation of the value stored inside.`
	`146`	`+ ///`
	`147`	+ /// Warning: This ivar must only ever be accessed via `_ptr` after
	`148`	`+ /// its initialization.`
`145`	`149`	`@usableFromInline`
`146`	`150`	`internal let _storage: _Rep`
`147`	`151`
`@@ -152,7 +156,7 @@ public class ManagedAtomicLazyReference<Instance: AnyObject> {`
`152`	`156`	`}`
`153`	`157`
`154`	`158`	`deinit {`
`155`		`- if let unmanaged = _storage.dispose() {`
	`159`	`+ if let unmanaged = _ptr.pointee.dispose() {`
`156`	`160`	`unmanaged.release()`
`157`	`161`	`}`
`158`	`162`	`}`