NFC: Assert that we don't add llbuild commands with the same name twice (#7698)

Add debug assertion to avoid llbuild command name conflicts.

Depends on #7695

### Motivation:

One of the reasons we couldn't reveal
#7695 issue for long
time (at least past 2 releases) is that we overlooked name conflicts on
`addWriteLinkFileListCommand`.

Looking into the manifest builder, some of the commands also forgot to
assert name conflicts, so it was error-prone.

### Modifications:

Add a convenience method to perform assertions consistently

### Result:

NFC for release build. Just add debug assertions

Author: kateinoigakukun

Sources/LLBuildManifest/LLBuildManifest.swift

@@ -226,51 +226,52 @@ public struct LLBuildManifest {
         targets[target, default: Target(name: target, nodes: [])].nodes.append(node)
     }
 
+    private mutating func addCommand(name: String, tool: ToolProtocol) {
+        assert(commands[name] == nil, "already had a command named '\(name)'")
+        commands[name] = Command(name: name, tool: tool)
+    }
+
     public mutating func addPhonyCmd(
         name: String,
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = PhonyTool(inputs: inputs, outputs: outputs)
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addTestDiscoveryCmd(
         name: String,
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = TestDiscoveryTool(inputs: inputs, outputs: outputs)
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addTestEntryPointCmd(
         name: String,
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = TestEntryPointTool(inputs: inputs, outputs: outputs)
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addCopyCmd(
         name: String,
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = CopyTool(inputs: inputs, outputs: outputs)
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addEntitlementPlistCommand(entitlement: String, outputPath: AbsolutePath) {
         let inputs = WriteAuxiliary.EntitlementPlist.computeInputs(entitlement: entitlement)
         let tool = WriteAuxiliaryFile(inputs: inputs, outputFilePath: outputPath)
         let name = outputPath.pathString
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addWriteLinkFileListCommand(
@@ -280,7 +281,7 @@ public struct LLBuildManifest {
         let inputs = WriteAuxiliary.LinkFileList.computeInputs(objects: objects)
         let tool = WriteAuxiliaryFile(inputs: inputs, outputFilePath: linkFileListPath)
         let name = linkFileListPath.pathString
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addWriteSourcesFileListCommand(
@@ -290,7 +291,7 @@ public struct LLBuildManifest {
         let inputs = WriteAuxiliary.SourcesFileList.computeInputs(sources: sources)
         let tool = WriteAuxiliaryFile(inputs: inputs, outputFilePath: sourcesFileListPath)
         let name = sourcesFileListPath.pathString
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addSwiftGetVersionCommand(
@@ -300,14 +301,14 @@ public struct LLBuildManifest {
         let inputs = WriteAuxiliary.SwiftGetVersion.computeInputs(swiftCompilerPath: swiftCompilerPath)
         let tool = WriteAuxiliaryFile(inputs: inputs, outputFilePath: swiftVersionFilePath, alwaysOutOfDate: true)
         let name = swiftVersionFilePath.pathString
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addWriteInfoPlistCommand(principalClass: String, outputPath: AbsolutePath) {
         let inputs = WriteAuxiliary.XCTestInfoPlist.computeInputs(principalClass: principalClass)
         let tool = WriteAuxiliaryFile(inputs: inputs, outputFilePath: outputPath)
         let name = outputPath.pathString
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addWriteEmbeddedResourcesCommand(
@@ -317,17 +318,16 @@ public struct LLBuildManifest {
         let inputs = WriteAuxiliary.EmbeddedResources.computeInputs(resources: resources)
         let tool = WriteAuxiliaryFile(inputs: inputs, outputFilePath: outputPath)
         let name = outputPath.pathString
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addPkgStructureCmd(
         name: String,
         inputs: [Node],
         outputs: [Node]
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = PackageStructureTool(inputs: inputs, outputs: outputs)
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addShellCmd(
@@ -340,7 +340,6 @@ public struct LLBuildManifest {
         workingDirectory: String? = nil,
         allowMissingInputs: Bool = false
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = ShellTool(
             description: description,
             inputs: inputs,
@@ -350,7 +349,7 @@ public struct LLBuildManifest {
             workingDirectory: workingDirectory,
             allowMissingInputs: allowMissingInputs
         )
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addSwiftFrontendCmd(
@@ -362,15 +361,14 @@ public struct LLBuildManifest {
         outputs: [Node],
         arguments: [String]
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = SwiftFrontendTool(
                 moduleName: moduleName,
                 description: description,
                 inputs: inputs,
                 outputs: outputs,
                 arguments: arguments
         )
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addClangCmd(
@@ -381,15 +379,14 @@ public struct LLBuildManifest {
         arguments: [String],
         dependencies: String? = nil
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = ClangTool(
             description: description,
             inputs: inputs,
             outputs: outputs,
             arguments: arguments,
             dependencies: dependencies
         )
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 
     public mutating func addSwiftCmd(
@@ -411,7 +408,6 @@ public struct LLBuildManifest {
         outputFileMapPath: AbsolutePath,
         prepareForIndexing: Bool
     ) {
-        assert(commands[name] == nil, "already had a command named '\(name)'")
         let tool = SwiftCompilerTool(
             inputs: inputs,
             outputs: outputs,
@@ -430,6 +426,6 @@ public struct LLBuildManifest {
             outputFileMapPath: outputFileMapPath,
             prepareForIndexing: prepareForIndexing
         )
-        commands[name] = Command(name: name, tool: tool)
+        addCommand(name: name, tool: tool)
     }
 }