Make subcommand constructor with options private.

toolchain/driver/build_runtimes_subcommand.h

@@ -8,6 +8,7 @@
 #include "common/command_line.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
+#include "toolchain/driver/carbon_runner.h"
 #include "toolchain/driver/codegen_options.h"
 #include "toolchain/driver/driver_env.h"
 #include "toolchain/driver/driver_subcommand.h"
@@ -26,19 +27,21 @@ struct BuildRuntimesOptions {
 
 // Implements the link subcommand of the driver.
 class BuildRuntimesSubcommand : public DriverSubcommand {
+  friend CarbonRunner;
+
  public:
   explicit BuildRuntimesSubcommand();
 
-  // For manual construction of subcommands.
-  explicit BuildRuntimesSubcommand(BuildRuntimesOptions options);
-
   auto BuildOptions(CommandLine::CommandBuilder& b) -> void override {
     options_.Build(b);
   }
 
   auto Run(DriverEnv& driver_env) -> DriverResult override;
 
  private:
+  // For manual construction of subcommands.
+  explicit BuildRuntimesSubcommand(BuildRuntimesOptions options);
+
   auto RunInternal(DriverEnv& driver_env) -> ErrorOr<std::filesystem::path>;
 
   BuildRuntimesOptions options_;

toolchain/driver/clang_subcommand.h

@@ -8,6 +8,7 @@
 #include "common/command_line.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
+#include "toolchain/driver/carbon_runner.h"
 #include "toolchain/driver/driver_env.h"
 #include "toolchain/driver/driver_subcommand.h"
 
@@ -26,19 +27,21 @@ struct ClangOptions {
 
 // Implements the clang subcommand of the driver.
 class ClangSubcommand : public DriverSubcommand {
+  friend CarbonRunner;
+
  public:
   explicit ClangSubcommand();
 
-  // For manual construction of subcommands.
-  explicit ClangSubcommand(ClangOptions options);
-
   auto BuildOptions(CommandLine::CommandBuilder& b) -> void override {
     options_.Build(b);
   }
 
   auto Run(DriverEnv& driver_env) -> DriverResult override;
 
  private:
+  // For manual construction of subcommands.
+  explicit ClangSubcommand(ClangOptions options);
+
   ClangOptions options_;
 };
 

toolchain/driver/compile_subcommand.h

@@ -11,6 +11,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "toolchain/check/check.h"
+#include "toolchain/driver/carbon_runner.h"
 #include "toolchain/driver/codegen_options.h"
 #include "toolchain/driver/driver_env.h"
 #include "toolchain/driver/driver_subcommand.h"
@@ -73,19 +74,21 @@ struct CompileOptions {
 
 // Implements the compile subcommand of the driver.
 class CompileSubcommand : public DriverSubcommand {
+  friend CarbonRunner;
+
  public:
   explicit CompileSubcommand();
 
-  // For manual construction of subcommands.
-  explicit CompileSubcommand(CompileOptions options);
-
   auto BuildOptions(CommandLine::CommandBuilder& b) -> void override {
     options_.Build(b);
   }
 
   auto Run(DriverEnv& driver_env) -> DriverResult override;
 
  private:
+  // For manual construction of subcommands.
+  explicit CompileSubcommand(CompileOptions options);
+
   // Does custom validation of the compile-subcommand options structure beyond
   // what the command line parsing library supports. Diagnoses and returns false
   // on failure.

toolchain/driver/format_subcommand.h

@@ -6,6 +6,7 @@
 #define CARBON_TOOLCHAIN_DRIVER_FORMAT_SUBCOMMAND_H_
 
 #include "common/command_line.h"
+#include "toolchain/driver/carbon_runner.h"
 #include "toolchain/driver/driver_env.h"
 #include "toolchain/driver/driver_subcommand.h"
 
@@ -23,19 +24,21 @@ struct FormatOptions {
 
 // Implements the format subcommand of the driver.
 class FormatSubcommand : public DriverSubcommand {
+  friend CarbonRunner;
+
  public:
   explicit FormatSubcommand();
 
-  // For manual construction of subcommands.
-  explicit FormatSubcommand(FormatOptions options);
-
   auto BuildOptions(CommandLine::CommandBuilder& b) -> void override {
     options_.Build(b);
   }
 
   auto Run(DriverEnv& driver_env) -> DriverResult override;
 
  private:
+  // For manual construction of subcommands.
+  explicit FormatSubcommand(FormatOptions options);
+
   FormatOptions options_;
 };
 

toolchain/driver/link_subcommand.h

@@ -9,6 +9,7 @@
 #include "common/error.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
+#include "toolchain/driver/carbon_runner.h"
 #include "toolchain/driver/codegen_options.h"
 #include "toolchain/driver/driver_env.h"
 #include "toolchain/driver/driver_subcommand.h"
@@ -28,19 +29,21 @@ struct LinkOptions {
 
 // Implements the link subcommand of the driver.
 class LinkSubcommand : public DriverSubcommand {
+  friend CarbonRunner;
+
  public:
   explicit LinkSubcommand();
 
-  // For manual construction of subcommands.
-  explicit LinkSubcommand(LinkOptions options);
-
   auto BuildOptions(CommandLine::CommandBuilder& b) -> void override {
     options_.Build(b);
   }
 
   auto Run(DriverEnv& driver_env) -> DriverResult override;
 
  private:
+  // For manual construction of subcommands.
+  explicit LinkSubcommand(LinkOptions options);
+
   auto RunInternal(DriverEnv& driver_env) -> ErrorOr<bool>;
 
   LinkOptions options_;

toolchain/driver/lld_subcommand.h

@@ -8,6 +8,7 @@
 #include "common/command_line.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
+#include "toolchain/driver/carbon_runner.h"
 #include "toolchain/driver/driver_env.h"
 #include "toolchain/driver/driver_subcommand.h"
 
@@ -36,19 +37,21 @@ struct LldOptions {
 
 // Implements the LLD subcommand of the driver.
 class LldSubcommand : public DriverSubcommand {
+  friend CarbonRunner;
+
  public:
   explicit LldSubcommand();
 
-  // For manual construction of subcommands.
-  explicit LldSubcommand(LldOptions options);
-
   auto BuildOptions(CommandLine::CommandBuilder& b) -> void override {
     options_.Build(b);
   }
 
   auto Run(DriverEnv& driver_env) -> DriverResult override;
 
  private:
+  // For manual construction of subcommands.
+  explicit LldSubcommand(LldOptions options);
+
   LldOptions options_;
 };
 

toolchain/driver/llvm_subcommand.h

@@ -9,6 +9,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "toolchain/base/llvm_tools.h"
+#include "toolchain/driver/carbon_runner.h"
 #include "toolchain/driver/driver_env.h"
 #include "toolchain/driver/driver_subcommand.h"
 
@@ -34,12 +35,11 @@ struct LLVMOptions {
 //
 // This provides access to the full collection of LLVM command line tools.
 class LLVMSubcommand : public DriverSubcommand {
+  friend CarbonRunner;
+
  public:
   explicit LLVMSubcommand();
 
-  // For manual construction of subcommands.
-  explicit LLVMSubcommand(LLVMOptions options);
-
   // The LLVM subcommand uses a custom subcommand structure, so `BuildOptions`
   // is a no-op and we override the more complex layer.
   auto BuildOptions(CommandLine::CommandBuilder& /*b*/) -> void override {
@@ -54,6 +54,9 @@ class LLVMSubcommand : public DriverSubcommand {
   auto Run(DriverEnv& driver_env) -> DriverResult override;
 
  private:
+  // For manual construction of subcommands.
+  explicit LLVMSubcommand(LLVMOptions options);
+
   LLVMOptions options_;
 };