Merge pull request #1144 from artemcm/AddConstValueExtractionPathHandling

artemcm · web-flow · commit 22b31770c103 · 2022-07-21T13:20:01.000-07:00
Add supplementary output path handling for extracted compile-time-known values
diff --git a/Sources/SwiftDriver/Driver/Driver.swift b/Sources/SwiftDriver/Driver/Driver.swift
@@ -287,6 +287,9 @@ public struct Driver {
   /// Path to the discovered dependencies file of the emit-module task.
   let emitModuleDependenciesFilePath: VirtualPath.Handle?
 
+  /// Path to emitted compile-time-known values.
+  let constValuesFilePath: VirtualPath.Handle?
+
   /// Path to the Objective-C generated header.
   let objcGeneratedHeaderPath: VirtualPath.Handle?
 
@@ -733,6 +736,14 @@ public struct Driver {
         emitModuleSeparately: emitModuleSeparately,
         outputFileMap: self.outputFileMap,
         moduleName: moduleOutputInfo.name)
+    self.constValuesFilePath = try Self.computeSupplementaryOutputPath(
+        &parsedOptions, type: .swiftConstValues, isOutputOptions: [.emitConstValues],
+        outputPath: .emitConstValuesPath,
+        compilerOutputType: compilerOutputType,
+        compilerMode: compilerMode,
+        emitModuleSeparately: emitModuleSeparately,
+        outputFileMap: self.outputFileMap,
+        moduleName: moduleOutputInfo.name)
     // FIXME: -fixits-output-path
     self.objcGeneratedHeaderPath = try Self.computeSupplementaryOutputPath(
         &parsedOptions, type: .objcHeader, isOutputOptions: [.emitObjcHeader],
diff --git a/Sources/SwiftDriver/Jobs/CompileJob.swift b/Sources/SwiftDriver/Jobs/CompileJob.swift
@@ -94,7 +94,8 @@ extension Driver {
          .diagnostics, .emitModuleDiagnostics, .objcHeader, .swiftDeps, .remap, .tbd,
          .moduleTrace, .yamlOptimizationRecord, .bitstreamOptimizationRecord, .pcm, .pch,
          .clangModuleMap, .jsonCompilerFeatures, .jsonTargetInfo, .jsonSwiftArtifacts,
-         .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline, .jsonABIBaseline, nil:
+         .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline, .jsonABIBaseline,
+         .swiftConstValues, nil:
       return false
     }
   }
@@ -459,7 +460,8 @@ extension FileType {
          .objcHeader, .image, .swiftDeps, .moduleTrace, .tbd, .yamlOptimizationRecord,
          .bitstreamOptimizationRecord, .swiftInterface, .privateSwiftInterface,
          .swiftSourceInfoFile, .clangModuleMap, .jsonSwiftArtifacts,
-         .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline, .jsonABIBaseline:
+         .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline, .jsonABIBaseline,
+         .swiftConstValues:
       fatalError("Output type can never be a primary output")
     }
   }
diff --git a/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift b/Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
@@ -394,6 +394,12 @@ extension Driver {
         input: input,
         flag: "-emit-dependencies-path")
 
+      addOutputOfType(
+        outputType: .swiftConstValues,
+        finalOutputPath: constValuesFilePath,
+        input: input,
+        flag: "-emit-const-values-path")
+
       addOutputOfType(
         outputType: .swiftDeps,
         finalOutputPath: referenceDependenciesPath,
diff --git a/Sources/SwiftDriver/Utilities/FileType.swift b/Sources/SwiftDriver/Utilities/FileType.swift
@@ -57,6 +57,9 @@ public enum FileType: String, Hashable, CaseIterable, Codable {
   /// Serialized source information.
   case swiftSourceInfoFile = "swiftsourceinfo"
 
+  /// Extracted compile-time-known values
+  case swiftConstValues = "swiftconstvalues"
+
   /// Assembler source.
   case assembly = "s"
 
@@ -229,6 +232,9 @@ extension FileType: CustomStringConvertible {
 
     case .jsonABIBaseline:
       return "abi-baseline-json"
+
+    case .swiftConstValues:
+      return "const-values"
     }
   }
 }
@@ -248,7 +254,7 @@ extension FileType {
          .swiftInterface, .privateSwiftInterface, .swiftSourceInfoFile,
          .jsonDependencies, .clangModuleMap, .jsonTargetInfo, .jsonCompilerFeatures,
          .jsonSwiftArtifacts, .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline,
-         .jsonABIBaseline:
+         .jsonABIBaseline, .swiftConstValues:
       return false
     }
   }
@@ -351,6 +357,8 @@ extension FileType {
       return "api-baseline-json"
     case .jsonABIBaseline:
       return "abi-baseline-json"
+    case .swiftConstValues:
+      return "const-values"
     }
   }
 }
@@ -362,7 +370,7 @@ extension FileType {
          .raw_sil, .llvmIR,.objcHeader, .autolink, .importedModules, .tbd,
          .moduleTrace, .yamlOptimizationRecord, .swiftInterface, .privateSwiftInterface,
          .jsonDependencies, .clangModuleMap, .jsonCompilerFeatures, .jsonTargetInfo,
-         .jsonSwiftArtifacts, .jsonAPIBaseline, .jsonABIBaseline:
+         .jsonSwiftArtifacts, .jsonAPIBaseline, .jsonABIBaseline, .swiftConstValues:
       return true
     case .image, .object, .dSYM, .pch, .sib, .raw_sib, .swiftModule,
          .swiftDocumentation, .swiftSourceInfoFile, .llvmBitcode, .diagnostics,
@@ -385,7 +393,7 @@ extension FileType {
          .importedModules, .tbd, .moduleTrace, .indexData, .yamlOptimizationRecord,
          .modDepCache, .bitstreamOptimizationRecord, .pcm, .pch, .jsonDependencies,
          .clangModuleMap, .jsonCompilerFeatures, .jsonTargetInfo, .jsonSwiftArtifacts,
-         .indexUnitOutputPath, .jsonAPIBaseline, .jsonABIBaseline:
+         .indexUnitOutputPath, .jsonAPIBaseline, .jsonABIBaseline, .swiftConstValues:
       return false
     }
   }
diff --git a/Sources/SwiftOptions/Options.swift b/Sources/SwiftOptions/Options.swift
@@ -60,6 +60,7 @@ extension Option {
   public static let compilerStyleDiags: Option = Option("-compiler-style-diags", .flag, attributes: [.noDriver], helpText: "Print compiler style diagnostics to stderr.")
   public static let compilerStyleDiags_: Option = Option("--compiler-style-diags", .flag, alias: Option.compilerStyleDiags, attributes: [.noDriver], helpText: "Print compiler style diagnostics to stderr.")
   public static let conditionalRuntimeRecords: Option = Option("-conditional-runtime-records", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Allow removal of runtime metadata records (public types, protocol conformances) based on whether they're used or unused")
+  public static let constGatherProtocolsFile: Option = Option("-const-gather-protocols-file", .separate, attributes: [.frontend, .noDriver], metaVar: "<path>", helpText: "Specify a list of protocols for extraction of conformances' const values'")
   public static let continueBuildingAfterErrors: Option = Option("-continue-building-after-errors", .flag, attributes: [.frontend, .doesNotAffectIncrementalBuild], helpText: "Continue building, even after errors are encountered")
   public static let coveragePrefixMap: Option = Option("-coverage-prefix-map", .separate, attributes: [.frontend], metaVar: "<prefix=replacement>", helpText: "Remap source paths in coverage info")
   public static let CrossModuleOptimization: Option = Option("-cross-module-optimization", .flag, attributes: [.helpHidden, .frontend], helpText: "Perform cross-module optimization")
@@ -222,6 +223,8 @@ extension Option {
   public static let emitAssembly: Option = Option("-emit-assembly", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit assembly file(s) (-S)", group: .modes)
   public static let emitBc: Option = Option("-emit-bc", .flag, attributes: [.frontend, .noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit LLVM BC file(s)", group: .modes)
   public static let emitClangHeaderPath: Option = Option("-emit-clang-header-path", .separate, alias: Option.emitObjcHeaderPath, attributes: [.frontend, .noDriver, .noInteractive, .argumentIsPath, .supplementaryOutput], helpText: "Emit an Objective-C and C++ header file to <path>")
+  public static let emitConstValuesPath: Option = Option("-emit-const-values-path", .separate, attributes: [.frontend, .noInteractive, .argumentIsPath, .supplementaryOutput], metaVar: "<path>", helpText: "Emit the extracted compile-time known values to <path>")
+  public static let emitConstValues: Option = Option("-emit-const-values", .flag, attributes: [.noInteractive, .supplementaryOutput])
   public static let emitDependenciesPath: Option = Option("-emit-dependencies-path", .separate, attributes: [.frontend, .noDriver], metaVar: "<path>", helpText: "Output basic Make-compatible dependencies file to <path>")
   public static let emitDependencies: Option = Option("-emit-dependencies", .flag, attributes: [.frontend, .noInteractive, .supplementaryOutput], helpText: "Emit basic Make-compatible dependencies files")
   public static let emitExecutable: Option = Option("-emit-executable", .flag, attributes: [.noInteractive, .doesNotAffectIncrementalBuild], helpText: "Emit a linked executable", group: .modes)
@@ -395,6 +398,8 @@ extension Option {
   public static let iframework: Option = Option("-iframework", .joinedOrSeparate, attributes: [.noDriver, .argumentIsPath], helpText: "add a directory to the clang importer system framework search path")
   public static let ignoreAlwaysInline: Option = Option("-ignore-always-inline", .flag, attributes: [.helpHidden, .frontend, .noDriver], helpText: "Ignore @inline(__always) attributes.")
   public static let ignoreModuleSourceInfo: Option = Option("-ignore-module-source-info", .flag, attributes: [.frontend, .noDriver], helpText: "Avoid getting source location from .swiftsourceinfo files")
+  public static let ignoreSpiGroups: Option = Option("-ignore-spi-group", .separate, attributes: [.noDriver], helpText: "SPI group name to not diagnose about")
+  public static let ignoreSpiGroups_: Option = Option("--ignore-spi-group", .separate, alias: Option.ignoreSpiGroups, attributes: [.noDriver], helpText: "SPI group name to not diagnose about")
   public static let ignoredUsrs: Option = Option("-ignored-usrs", .separate, attributes: [.noDriver, .argumentIsPath], metaVar: "<path>", helpText: "the file containing USRs of removed decls that the digester should ignore")
   public static let ignoredUsrs_: Option = Option("--ignored-usrs", .separate, alias: Option.ignoredUsrs, attributes: [.noDriver, .argumentIsPath], metaVar: "<path>", helpText: "the file containing USRs of removed decls that the digester should ignore")
   public static let importCfTypes: Option = Option("-import-cf-types", .flag, attributes: [.helpHidden, .frontend], helpText: "Recognize and import CF types as class types")
@@ -732,6 +737,7 @@ extension Option {
       Option.compilerStyleDiags,
       Option.compilerStyleDiags_,
       Option.conditionalRuntimeRecords,
+      Option.constGatherProtocolsFile,
       Option.continueBuildingAfterErrors,
       Option.coveragePrefixMap,
       Option.CrossModuleOptimization,
@@ -894,6 +900,8 @@ extension Option {
       Option.emitAssembly,
       Option.emitBc,
       Option.emitClangHeaderPath,
+      Option.emitConstValuesPath,
+      Option.emitConstValues,
       Option.emitDependenciesPath,
       Option.emitDependencies,
       Option.emitExecutable,
diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift
@@ -1047,6 +1047,144 @@ final class SwiftDriverTests: XCTestCase {
     XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-serialize-diagnostics-path")))
   }
 
+  func testEmitConstValues() throws {
+    do { // Just single files
+      var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "baz.swift",
+                                     "-module-name", "Foo", "-emit-const-values"])
+      let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(plannedJobs.count, 4)
+      XCTAssertEqual(plannedJobs[0].kind, .compile)
+      XCTAssertTrue(plannedJobs[0].commandLine.contains("-emit-const-values-path"))
+      XCTAssertTrue(plannedJobs[0].outputs.contains(where: { $0.type == .swiftConstValues }))
+      XCTAssertEqual(plannedJobs[1].kind, .compile)
+      XCTAssertTrue(plannedJobs[1].commandLine.contains("-emit-const-values-path"))
+      XCTAssertTrue(plannedJobs[1].outputs.contains(where: { $0.type == .swiftConstValues }))
+      XCTAssertEqual(plannedJobs[2].kind, .compile)
+      XCTAssertTrue(plannedJobs[2].commandLine.contains("-emit-const-values-path"))
+      XCTAssertTrue(plannedJobs[2].outputs.contains(where: { $0.type == .swiftConstValues }))
+      XCTAssertEqual(plannedJobs[3].kind, .link)
+    }
+
+    do { // Just single files with emit-module
+      var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "baz.swift", "-emit-module",
+                                     "-module-name", "Foo", "-emit-const-values"])
+      let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(plannedJobs.count, 4)
+      XCTAssertEqual(plannedJobs[0].kind, .emitModule)
+      // Ensure the emit-module job does *not* contain this flag
+      XCTAssertFalse(plannedJobs[0].commandLine.contains("-emit-const-values-path"))
+      XCTAssertEqual(plannedJobs[1].kind, .compile)
+      XCTAssertTrue(plannedJobs[1].commandLine.contains("-emit-const-values-path"))
+      XCTAssertTrue(plannedJobs[1].outputs.contains(where: { $0.type == .swiftConstValues }))
+      XCTAssertEqual(plannedJobs[2].kind, .compile)
+      XCTAssertTrue(plannedJobs[2].commandLine.contains("-emit-const-values-path"))
+      XCTAssertTrue(plannedJobs[2].outputs.contains(where: { $0.type == .swiftConstValues }))
+      XCTAssertEqual(plannedJobs[3].kind, .compile)
+      XCTAssertTrue(plannedJobs[3].commandLine.contains("-emit-const-values-path"))
+      XCTAssertTrue(plannedJobs[3].outputs.contains(where: { $0.type == .swiftConstValues }))
+    }
+
+    do { // Batch
+      var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "baz.swift",
+                                     "-enable-batch-mode","-driver-batch-size-limit", "2",
+                                     "-module-name", "Foo", "-emit-const-values"])
+      let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(plannedJobs.count, 3)
+      XCTAssertEqual(plannedJobs[0].kind, .compile)
+      XCTAssertTrue(plannedJobs[0].primaryInputs.map{ $0.file.description }.elementsEqual(["foo.swift",
+                                                                                           "bar.swift"]))
+      XCTAssertTrue(plannedJobs[0].commandLine.contains("-emit-const-values-path"))
+      XCTAssertEqual(plannedJobs[0].outputs.filter({ $0.type == .swiftConstValues }).count, 2)
+      XCTAssertEqual(plannedJobs[1].kind, .compile)
+      XCTAssertTrue(plannedJobs[1].primaryInputs.map{ $0.file.description }.elementsEqual(["baz.swift"]))
+      XCTAssertTrue(plannedJobs[1].commandLine.contains("-emit-const-values-path"))
+      XCTAssertEqual(plannedJobs[1].outputs.filter({ $0.type == .swiftConstValues }).count, 1)
+      XCTAssertEqual(plannedJobs[2].kind, .link)
+    }
+
+    try withTemporaryFile { fileMapFile in // Batch with output-file-map
+      let outputMapContents = """
+        {
+          "foo.swift": {
+            "object": "/tmp/foo.build/foo.swift.o",
+            "const-values": "/tmp/foo.build/foo.swiftconstvalues"
+          },
+          "bar.swift": {
+            "object": "/tmp/foo.build/bar.swift.o",
+            "const-values": "/tmp/foo.build/bar.swiftconstvalues"
+          },
+          "baz.swift": {
+            "object": "/tmp/foo.build/baz.swift.o",
+            "const-values": "/tmp/foo.build/baz.swiftconstvalues"
+          }
+        }
+        """
+      try localFileSystem.writeFileContents(fileMapFile.path) { $0 <<< outputMapContents }
+      var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "baz.swift",
+                                     "-enable-batch-mode","-driver-batch-size-limit", "2",
+                                     "-module-name", "Foo", "-emit-const-values",
+                                     "-output-file-map", fileMapFile.path.description])
+      let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(plannedJobs.count, 3)
+      XCTAssertEqual(plannedJobs[0].kind, .compile)
+      XCTAssertTrue(plannedJobs[0].primaryInputs.map{ $0.file.description }.elementsEqual(["foo.swift",
+                                                                                           "bar.swift"]))
+      XCTAssertTrue(plannedJobs[0].commandLine.contains(subsequence: [.flag("-emit-const-values-path"), .path(.absolute(.init("/tmp/foo.build/foo.swiftconstvalues")))]))
+      XCTAssertTrue(plannedJobs[0].commandLine.contains(subsequence: [.flag("-emit-const-values-path"), .path(.absolute(.init("/tmp/foo.build/bar.swiftconstvalues")))]))
+      XCTAssertEqual(plannedJobs[0].outputs.filter({ $0.type == .swiftConstValues }).count, 2)
+      XCTAssertEqual(plannedJobs[1].kind, .compile)
+      XCTAssertTrue(plannedJobs[1].primaryInputs.map{ $0.file.description }.elementsEqual(["baz.swift"]))
+      XCTAssertTrue(plannedJobs[1].commandLine.contains("-emit-const-values-path"))
+      XCTAssertEqual(plannedJobs[1].outputs.filter({ $0.type == .swiftConstValues }).count, 1)
+      XCTAssertTrue(plannedJobs[1].commandLine.contains(subsequence: [.flag("-emit-const-values-path"), .path(.absolute(.init("/tmp/foo.build/baz.swiftconstvalues")))]))
+      XCTAssertEqual(plannedJobs[2].kind, .link)
+    }
+
+    do { // WMO
+      var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "baz.swift",
+                                     "-whole-module-optimization",
+                                     "-module-name", "Foo", "-emit-const-values"])
+      let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(plannedJobs.count, 2)
+      XCTAssertEqual(plannedJobs[0].kind, .compile)
+      XCTAssertEqual(plannedJobs[0].outputs.filter({ $0.type == .swiftConstValues }).count, 1)
+      XCTAssertEqual(plannedJobs[1].kind, .link)
+    }
+
+    try withTemporaryFile { fileMapFile in // WMO with output-file-map
+      let outputMapContents = """
+        {
+          "": {
+            "const-values": "/tmp/foo.build/foo.master.swiftconstvalues"
+          },
+          "foo.swift": {
+            "object": "/tmp/foo.build/foo.swift.o",
+            "const-values": "/tmp/foo.build/foo.swiftconstvalues"
+          },
+          "bar.swift": {
+            "object": "/tmp/foo.build/bar.swift.o",
+            "const-values": "/tmp/foo.build/bar.swiftconstvalues"
+          },
+          "baz.swift": {
+            "object": "/tmp/foo.build/baz.swift.o",
+            "const-values": "/tmp/foo.build/baz.swiftconstvalues"
+          }
+        }
+        """
+      try localFileSystem.writeFileContents(fileMapFile.path) { $0 <<< outputMapContents }
+      var driver = try Driver(args: ["swiftc", "foo.swift", "bar.swift", "baz.swift",
+                                     "-whole-module-optimization",
+                                     "-module-name", "Foo", "-emit-const-values",
+                                     "-output-file-map", fileMapFile.path.description])
+      let plannedJobs = try driver.planBuild().removingAutolinkExtractJobs()
+      XCTAssertEqual(plannedJobs.count, 2)
+      XCTAssertEqual(plannedJobs[0].kind, .compile)
+      XCTAssertEqual(plannedJobs[0].outputs.first(where: { $0.type == .swiftConstValues })?.file,
+                     .absolute(.init("/tmp/foo.build/foo.master.swiftconstvalues")))
+      XCTAssertEqual(plannedJobs[1].kind, .link)
+    }
+  }
+
   func testEmitModuleSepratelyEmittingDiagnosticsWithOutputFileMap() throws {
     try withTemporaryDirectory { path in
       let outputFileMap = path.appending(component: "outputFileMap.json")

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,8 @@ extension Driver {`
`94`	`94`	`.diagnostics, .emitModuleDiagnostics, .objcHeader, .swiftDeps, .remap, .tbd,`
`95`	`95`	`.moduleTrace, .yamlOptimizationRecord, .bitstreamOptimizationRecord, .pcm, .pch,`
`96`	`96`	`.clangModuleMap, .jsonCompilerFeatures, .jsonTargetInfo, .jsonSwiftArtifacts,`
`97`		`- .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline, .jsonABIBaseline, nil:`
	`97`	`+ .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline, .jsonABIBaseline,`
	`98`	`+ .swiftConstValues, nil:`
`98`	`99`	`return false`
`99`	`100`	`}`
`100`	`101`	`}`
`@@ -459,7 +460,8 @@ extension FileType {`
`459`	`460`	`.objcHeader, .image, .swiftDeps, .moduleTrace, .tbd, .yamlOptimizationRecord,`
`460`	`461`	`.bitstreamOptimizationRecord, .swiftInterface, .privateSwiftInterface,`
`461`	`462`	`.swiftSourceInfoFile, .clangModuleMap, .jsonSwiftArtifacts,`
`462`		`- .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline, .jsonABIBaseline:`
	`463`	`+ .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline, .jsonABIBaseline,`
	`464`	`+ .swiftConstValues:`
`463`	`465`	`fatalError("Output type can never be a primary output")`
`464`	`466`	`}`
`465`	`467`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,9 @@ public enum FileType: String, Hashable, CaseIterable, Codable {`
`57`	`57`	`/// Serialized source information.`
`58`	`58`	`case swiftSourceInfoFile = "swiftsourceinfo"`
`59`	`59`
	`60`	`+ /// Extracted compile-time-known values`
	`61`	`+ case swiftConstValues = "swiftconstvalues"`
	`62`	`+`
`60`	`63`	`/// Assembler source.`
`61`	`64`	`case assembly = "s"`
`62`	`65`
`@@ -229,6 +232,9 @@ extension FileType: CustomStringConvertible {`
`229`	`232`
`230`	`233`	`case .jsonABIBaseline:`
`231`	`234`	`return "abi-baseline-json"`
	`235`	`+`
	`236`	`+ case .swiftConstValues:`
	`237`	`+ return "const-values"`
`232`	`238`	`}`
`233`	`239`	`}`
`234`	`240`	`}`
`@@ -248,7 +254,7 @@ extension FileType {`
`248`	`254`	`.swiftInterface, .privateSwiftInterface, .swiftSourceInfoFile,`
`249`	`255`	`.jsonDependencies, .clangModuleMap, .jsonTargetInfo, .jsonCompilerFeatures,`
`250`	`256`	`.jsonSwiftArtifacts, .indexUnitOutputPath, .modDepCache, .jsonAPIBaseline,`
`251`		`- .jsonABIBaseline:`
	`257`	`+ .jsonABIBaseline, .swiftConstValues:`
`252`	`258`	`return false`
`253`	`259`	`}`
`254`	`260`	`}`
`@@ -351,6 +357,8 @@ extension FileType {`
`351`	`357`	`return "api-baseline-json"`
`352`	`358`	`case .jsonABIBaseline:`
`353`	`359`	`return "abi-baseline-json"`
	`360`	`+ case .swiftConstValues:`
	`361`	`+ return "const-values"`
`354`	`362`	`}`
`355`	`363`	`}`
`356`	`364`	`}`
`@@ -362,7 +370,7 @@ extension FileType {`
`362`	`370`	`.raw_sil, .llvmIR,.objcHeader, .autolink, .importedModules, .tbd,`
`363`	`371`	`.moduleTrace, .yamlOptimizationRecord, .swiftInterface, .privateSwiftInterface,`
`364`	`372`	`.jsonDependencies, .clangModuleMap, .jsonCompilerFeatures, .jsonTargetInfo,`
`365`		`- .jsonSwiftArtifacts, .jsonAPIBaseline, .jsonABIBaseline:`
	`373`	`+ .jsonSwiftArtifacts, .jsonAPIBaseline, .jsonABIBaseline, .swiftConstValues:`
`366`	`374`	`return true`
`367`	`375`	`case .image, .object, .dSYM, .pch, .sib, .raw_sib, .swiftModule,`
`368`	`376`	`.swiftDocumentation, .swiftSourceInfoFile, .llvmBitcode, .diagnostics,`
`@@ -385,7 +393,7 @@ extension FileType {`
`385`	`393`	`.importedModules, .tbd, .moduleTrace, .indexData, .yamlOptimizationRecord,`
`386`	`394`	`.modDepCache, .bitstreamOptimizationRecord, .pcm, .pch, .jsonDependencies,`
`387`	`395`	`.clangModuleMap, .jsonCompilerFeatures, .jsonTargetInfo, .jsonSwiftArtifacts,`
`388`		`- .indexUnitOutputPath, .jsonAPIBaseline, .jsonABIBaseline:`
	`396`	`+ .indexUnitOutputPath, .jsonAPIBaseline, .jsonABIBaseline, .swiftConstValues:`
`389`	`397`	`return false`
`390`	`398`	`}`
`391`	`399`	`}`