Rename flag / variable

Author: keith

Sources/Build/BuildPlan.swift

@@ -1201,7 +1201,7 @@ public final class ProductBuildDescription {
     }
 
     private var deadStripArguments: [String] {
-        if buildParameters.disableDeadStrip {
+        if buildParameters.linkerDeadStrip {
             return []
         }
 

Sources/Commands/Options.swift

@@ -375,8 +375,11 @@ public struct SwiftToolOptions: ParsableArguments {
     @Option(name: .customLong("resolver-fingerprint-checking"))
     var resolverFingerprintCheckingMode: FingerprintCheckingMode = .warn
 
-    @Flag(name: .customLong("disable-dead-strip"), help: "Disable dead code stripping by the linker")
-    var disableDeadStrip: Bool = false
+    @Flag(
+        name: .customLong("dead-strip"),
+        inversion: .prefixedEnableDisable,
+        help: "Disable/enable dead code stripping by the linker")
+    var linkerDeadStrip: Bool = true
 
     @Flag(name: .customLong("netrc"), help: .hidden)
     var _deprecated_netrc: Bool = false

Sources/Commands/SwiftTool.swift

@@ -842,7 +842,7 @@ public class SwiftTool {
                 isXcodeBuildSystemEnabled: options.buildSystem == .xcode,
                 printManifestGraphviz: options.printManifestGraphviz,
                 forceTestDiscovery: options.enableTestDiscovery, // backwards compatibility, remove with --enable-test-discovery
-                disableDeadStrip: options.disableDeadStrip,
+                linkerDeadStrip: options.linkerDeadStrip,
                 isTTY: isTTY
             )
         })

Sources/SPMBuildCore/BuildParameters.swift

@@ -173,7 +173,7 @@ public struct BuildParameters: Encodable {
     public var testDiscoveryStrategy: TestDiscoveryStrategy
 
     /// Whether to disable dead code stripping by the linker
-    public var disableDeadStrip: Bool
+    public var linkerDeadStrip: Bool
 
     public var isTTY: Bool
 
@@ -203,7 +203,7 @@ public struct BuildParameters: Encodable {
         printManifestGraphviz: Bool = false,
         enableTestability: Bool? = nil,
         forceTestDiscovery: Bool = false,
-        disableDeadStrip: Bool = false,
+        linkerDeadStrip: Bool = false,
         isTTY: Bool = false
     ) {
         let triple = destinationTriple ?? .getHostTriple(usingSwiftCompiler: toolchain.swiftCompiler)
@@ -241,7 +241,7 @@ public struct BuildParameters: Encodable {
         self.enableTestability = enableTestability ?? (.debug == configuration)
         // decide if to enable the use of test manifests based on platform. this is likely to change in the future
         self.testDiscoveryStrategy = triple.isDarwin() ? .objectiveC : .manifest(generate: forceTestDiscovery)
-        self.disableDeadStrip = disableDeadStrip
+        self.linkerDeadStrip = linkerDeadStrip
         self.isTTY = isTTY
     }
 

Tests/BuildTests/BuildPlanTests.swift

@@ -70,7 +70,7 @@ final class BuildPlanTests: XCTestCase {
         destinationTriple: TSCUtility.Triple = hostTriple,
         indexStoreMode: BuildParameters.IndexStoreMode = .off,
         useExplicitModuleBuild: Bool = false,
-        disableDeadStrip: Bool = false
+        linkerDeadStrip: Bool = false
     ) -> BuildParameters {
         return BuildParameters(
             dataPath: buildPath,
@@ -84,7 +84,7 @@ final class BuildPlanTests: XCTestCase {
             canRenameEntrypointFunctionName: canRenameEntrypointFunctionName,
             indexStoreMode: indexStoreMode,
             useExplicitModuleBuild: useExplicitModuleBuild,
-            disableDeadStrip: disableDeadStrip
+            linkerDeadStrip: linkerDeadStrip
         )
     }
 
@@ -506,7 +506,7 @@ final class BuildPlanTests: XCTestCase {
         XCTAssertNoDiagnostics(observability.diagnostics)
 
         let result = try BuildPlanResult(plan: BuildPlan(
-            buildParameters: mockBuildParameters(config: .release, disableDeadStrip: true),
+            buildParameters: mockBuildParameters(config: .release, linkerDeadStrip: true),
             graph: graph,
             fileSystem: fs,
             observabilityScope: observability.topScope