From bfacb491546fa56778606f0acd7599cdd481cef1 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 24 Jan 2022 11:32:55 -0500
Subject: fileapi: Make internal "toolchains" field tables more local

`Toolchains::DumpToolchain` uses some statically initialized tables.
Move them into its definition.  This may avoid initializing them
when not needed.

Issue: #23126
---
 Source/cmFileAPIToolchains.cxx | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/Source/cmFileAPIToolchains.cxx b/Source/cmFileAPIToolchains.cxx
index b3540c9..fe2972f 100644
--- a/Source/cmFileAPIToolchains.cxx
+++ b/Source/cmFileAPIToolchains.cxx
@@ -30,10 +30,6 @@ class Toolchains
   cmFileAPI& FileAPI;
   unsigned long Version;
 
-  static const std::vector<ToolchainVariable> CompilerVariables;
-  static const std::vector<ToolchainVariable> CompilerImplicitVariables;
-  static const ToolchainVariable SourceFileExtensionsVariable;
-
   Json::Value DumpToolchains();
   Json::Value DumpToolchain(std::string const& lang);
   Json::Value DumpToolchainVariables(
@@ -48,24 +44,6 @@ public:
   Json::Value Dump();
 };
 
-const std::vector<ToolchainVariable> Toolchains::CompilerVariables{
-  { "path", "COMPILER", false },
-  { "id", "COMPILER_ID", false },
-  { "version", "COMPILER_VERSION", false },
-  { "target", "COMPILER_TARGET", false },
-};
-
-const std::vector<ToolchainVariable> Toolchains::CompilerImplicitVariables{
-  { "includeDirectories", "IMPLICIT_INCLUDE_DIRECTORIES", true },
-  { "linkDirectories", "IMPLICIT_LINK_DIRECTORIES", true },
-  { "linkFrameworkDirectories", "IMPLICIT_LINK_FRAMEWORK_DIRECTORIES", true },
-  { "linkLibraries", "IMPLICIT_LINK_LIBRARIES", true },
-};
-
-const ToolchainVariable Toolchains::SourceFileExtensionsVariable{
-  "sourceFileExtensions", "SOURCE_FILE_EXTENSIONS", true
-};
-
 Toolchains::Toolchains(cmFileAPI& fileAPI, unsigned long version)
   : FileAPI(fileAPI)
   , Version(version)
@@ -94,6 +72,25 @@ Json::Value Toolchains::DumpToolchains()
 
 Json::Value Toolchains::DumpToolchain(std::string const& lang)
 {
+  static const std::vector<ToolchainVariable> CompilerVariables{
+    { "path", "COMPILER", false },
+    { "id", "COMPILER_ID", false },
+    { "version", "COMPILER_VERSION", false },
+    { "target", "COMPILER_TARGET", false },
+  };
+
+  static const std::vector<ToolchainVariable> CompilerImplicitVariables{
+    { "includeDirectories", "IMPLICIT_INCLUDE_DIRECTORIES", true },
+    { "linkDirectories", "IMPLICIT_LINK_DIRECTORIES", true },
+    { "linkFrameworkDirectories", "IMPLICIT_LINK_FRAMEWORK_DIRECTORIES",
+      true },
+    { "linkLibraries", "IMPLICIT_LINK_LIBRARIES", true },
+  };
+
+  static const ToolchainVariable SourceFileExtensionsVariable{
+    "sourceFileExtensions", "SOURCE_FILE_EXTENSIONS", true
+  };
+
   const auto& mf =
     this->FileAPI.GetCMakeInstance()->GetGlobalGenerator()->GetMakefiles()[0];
   Json::Value toolchain = Json::objectValue;
-- 
cgit v0.12