diff --git a/CHANGELOG.md b/CHANGELOG.md
index 614f3aba79..746e612212 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th
 ## [UNRELEASED]
 
 - Added an experimental change which disables TRAP caching when [improved incremental analysis](https://github.com/github/roadmap/issues/1158) is enabled, since improved incremental analysis supersedes TRAP caching. This will improve performance and reduce Actions cache usage. We expect to roll this change out to everyone in March. [#3569](https://github.com/github/codeql-action/pull/3569)
+- We are rolling out improved incremental analysis to C/C++ analyses that use build mode `none`. We expect this rollout to be complete by the end of April 2026. [#3584](https://github.com/github/codeql-action/pull/3584)
 - Update default CodeQL bundle version to [2.25.0](https://github.com/github/codeql-action/releases/tag/codeql-bundle-v2.25.0). [#3585](https://github.com/github/codeql-action/pull/3585)
 
 ## 4.33.0 - 16 Mar 2026
diff --git a/lib/analyze-action-post.js b/lib/analyze-action-post.js
index fc4ff9ed10..02a6ff7ca8 100644
--- a/lib/analyze-action-post.js
+++ b/lib/analyze-action-post.js
@@ -162225,6 +162225,7 @@ async function isAnalyzingDefaultBranch() {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -162376,6 +162377,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -162406,6 +162412,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -162516,6 +162527,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -162524,6 +162536,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
index ec99b6dae6..f5c90bc1e6 100644
--- a/lib/analyze-action.js
+++ b/lib/analyze-action.js
@@ -107845,6 +107845,7 @@ async function isAnalyzingDefaultBranch() {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -108130,6 +108131,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -108160,6 +108166,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -108865,6 +108876,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -108873,6 +108885,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/autobuild-action.js b/lib/autobuild-action.js
index e48e773545..90354b765c 100644
--- a/lib/autobuild-action.js
+++ b/lib/autobuild-action.js
@@ -104279,6 +104279,7 @@ async function isAnalyzingDefaultBranch() {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -104428,6 +104429,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -104458,6 +104464,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -104891,6 +104902,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -104899,6 +104911,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/init-action-post.js b/lib/init-action-post.js
index 803c529807..7119b5d06c 100644
--- a/lib/init-action-post.js
+++ b/lib/init-action-post.js
@@ -165739,6 +165739,7 @@ async function isAnalyzingDefaultBranch() {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -165893,6 +165894,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -165923,6 +165929,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -166427,6 +166438,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -166435,6 +166447,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/init-action.js b/lib/init-action.js
index 93ec147f95..1038796448 100644
--- a/lib/init-action.js
+++ b/lib/init-action.js
@@ -105399,6 +105399,7 @@ async function getGeneratedFiles(workingDirectory) {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -105696,6 +105697,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -105726,6 +105732,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -106632,6 +106643,7 @@ async function loadUserConfig(logger, configFile, workspacePath, apiDetails, tem
   }
 }
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -106640,6 +106652,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js
index 365853dfd3..ffbc05b116 100644
--- a/lib/resolve-environment-action.js
+++ b/lib/resolve-environment-action.js
@@ -104272,6 +104272,7 @@ async function isAnalyzingDefaultBranch() {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -104419,6 +104420,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -104449,6 +104455,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -104559,6 +104570,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -104567,6 +104579,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/setup-codeql-action.js b/lib/setup-codeql-action.js
index 3748bf3193..b35c4327ed 100644
--- a/lib/setup-codeql-action.js
+++ b/lib/setup-codeql-action.js
@@ -104164,6 +104164,7 @@ function formatDuration(durationMs) {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -104314,6 +104315,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -104344,6 +104350,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -105125,6 +105136,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -105133,6 +105145,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/start-proxy-action-post.js b/lib/start-proxy-action-post.js
index 671dd6b923..d64b65a961 100644
--- a/lib/start-proxy-action-post.js
+++ b/lib/start-proxy-action-post.js
@@ -161691,6 +161691,7 @@ var semver3 = __toESM(require_semver2());
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -161782,6 +161783,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -161812,6 +161818,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -161922,6 +161933,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -161930,6 +161942,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/start-proxy-action.js b/lib/start-proxy-action.js
index 4409b70d5e..a50104cdea 100644
--- a/lib/start-proxy-action.js
+++ b/lib/start-proxy-action.js
@@ -121024,6 +121024,7 @@ function getActionsLogger() {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -121117,6 +121118,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -121147,6 +121153,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -121771,6 +121782,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -121779,6 +121791,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/upload-lib.js b/lib/upload-lib.js
index 9215b2f221..53d3b96b02 100644
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -107430,6 +107430,7 @@ async function isAnalyzingDefaultBranch() {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -107578,6 +107579,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -107608,6 +107614,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -107736,6 +107747,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -107744,6 +107756,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/upload-sarif-action-post.js b/lib/upload-sarif-action-post.js
index 5ac0c758a2..9c917db642 100644
--- a/lib/upload-sarif-action-post.js
+++ b/lib/upload-sarif-action-post.js
@@ -161851,6 +161851,7 @@ var semver3 = __toESM(require_semver2());
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -161946,6 +161947,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -161976,6 +161982,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -162086,6 +162097,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -162094,6 +162106,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/lib/upload-sarif-action.js b/lib/upload-sarif-action.js
index 014e3e294c..af1f098141 100644
--- a/lib/upload-sarif-action.js
+++ b/lib/upload-sarif-action.js
@@ -107139,6 +107139,7 @@ function formatDuration(durationMs) {
 
 // src/overlay/index.ts
 var CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
+var CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 var CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 var CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 var CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";
@@ -107289,6 +107290,11 @@ var featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  ["overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -107319,6 +107325,11 @@ var featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY
   },
+  ["overlay_analysis_cpp" /* OverlayAnalysisCpp */]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP
+  },
   ["overlay_analysis_csharp" /* OverlayAnalysisCsharp */]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
@@ -107934,6 +107945,7 @@ var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB = 14e3;
 var OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_BYTES = OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_V2_MB * 1e6;
 var OVERLAY_MINIMUM_MEMORY_MB = 5 * 1024;
 var OVERLAY_ANALYSIS_FEATURES = {
+  cpp: "overlay_analysis_cpp" /* OverlayAnalysisCpp */,
   csharp: "overlay_analysis_csharp" /* OverlayAnalysisCsharp */,
   go: "overlay_analysis_go" /* OverlayAnalysisGo */,
   java: "overlay_analysis_java" /* OverlayAnalysisJava */,
@@ -107942,6 +107954,7 @@ var OVERLAY_ANALYSIS_FEATURES = {
   ruby: "overlay_analysis_ruby" /* OverlayAnalysisRuby */
 };
 var OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES = {
+  cpp: "overlay_analysis_code_scanning_cpp" /* OverlayAnalysisCodeScanningCpp */,
   csharp: "overlay_analysis_code_scanning_csharp" /* OverlayAnalysisCodeScanningCsharp */,
   go: "overlay_analysis_code_scanning_go" /* OverlayAnalysisCodeScanningGo */,
   java: "overlay_analysis_code_scanning_java" /* OverlayAnalysisCodeScanningJava */,
diff --git a/src/config-utils.test.ts b/src/config-utils.test.ts
index fa4cb0cc22..0c14dcf9c4 100644
--- a/src/config-utils.test.ts
+++ b/src/config-utils.test.ts
@@ -2021,13 +2021,13 @@ for (const language in KnownLanguage) {
 
 // Verify that a language without a per-language overlay feature flag cannot have
 // overlay analysis enabled, even when the base overlay feature flag is on.
-// Using cpp here as it doesn't currently have overlay support — update this if
-// cpp gains overlay support.
+// Using swift here as it doesn't currently have overlay support — update this if
+// swift gains overlay support.
 test.serial(
   checkOverlayEnablementMacro,
   "No overlay analysis for language without per-language overlay feature flag",
   {
-    languages: [KnownLanguage.cpp],
+    languages: [KnownLanguage.swift],
     features: [Feature.OverlayAnalysis],
     isPullRequest: true,
   },
diff --git a/src/config-utils.ts b/src/config-utils.ts
index 94e425d9a3..1721ec2900 100644
--- a/src/config-utils.ts
+++ b/src/config-utils.ts
@@ -625,6 +625,7 @@ async function loadUserConfig(
  * without an entry will have overlay analysis disabled.
  */
 const OVERLAY_ANALYSIS_FEATURES: Partial<Record<Language, Feature>> = {
+  cpp: Feature.OverlayAnalysisCpp,
   csharp: Feature.OverlayAnalysisCsharp,
   go: Feature.OverlayAnalysisGo,
   java: Feature.OverlayAnalysisJava,
@@ -636,6 +637,7 @@ const OVERLAY_ANALYSIS_FEATURES: Partial<Record<Language, Feature>> = {
 const OVERLAY_ANALYSIS_CODE_SCANNING_FEATURES: Partial<
   Record<Language, Feature>
 > = {
+  cpp: Feature.OverlayAnalysisCodeScanningCpp,
   csharp: Feature.OverlayAnalysisCodeScanningCsharp,
   go: Feature.OverlayAnalysisCodeScanningGo,
   java: Feature.OverlayAnalysisCodeScanningJava,
diff --git a/src/feature-flags.ts b/src/feature-flags.ts
index d314f4f11d..9fa9b9590c 100644
--- a/src/feature-flags.ts
+++ b/src/feature-flags.ts
@@ -9,6 +9,7 @@ import * as defaults from "./defaults.json";
 import { Logger } from "./logging";
 import {
   CODEQL_OVERLAY_MINIMUM_VERSION,
+  CODEQL_OVERLAY_MINIMUM_VERSION_CPP,
   CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP,
   CODEQL_OVERLAY_MINIMUM_VERSION_GO,
   CODEQL_OVERLAY_MINIMUM_VERSION_JAVA,
@@ -57,12 +58,14 @@ export enum Feature {
   IgnoreGeneratedFiles = "ignore_generated_files",
   JavaNetworkDebugging = "java_network_debugging",
   OverlayAnalysis = "overlay_analysis",
+  OverlayAnalysisCodeScanningCpp = "overlay_analysis_code_scanning_cpp",
   OverlayAnalysisCodeScanningCsharp = "overlay_analysis_code_scanning_csharp",
   OverlayAnalysisCodeScanningGo = "overlay_analysis_code_scanning_go",
   OverlayAnalysisCodeScanningJava = "overlay_analysis_code_scanning_java",
   OverlayAnalysisCodeScanningJavascript = "overlay_analysis_code_scanning_javascript",
   OverlayAnalysisCodeScanningPython = "overlay_analysis_code_scanning_python",
   OverlayAnalysisCodeScanningRuby = "overlay_analysis_code_scanning_ruby",
+  OverlayAnalysisCpp = "overlay_analysis_cpp",
   OverlayAnalysisCsharp = "overlay_analysis_csharp",
   /** Disable TRAP caching when overlay analysis is enabled. */
   OverlayAnalysisDisableTrapCaching = "overlay_analysis_disable_trap_caching",
@@ -199,6 +202,11 @@ export const featureConfig = {
   // Per-language overlay feature flags. Each has minimumVersion set to the
   // minimum CLI version that supports overlay analysis for that language.
   // Only languages that are GA or in staff-ship should have feature flags here.
+  [Feature.OverlayAnalysisCodeScanningCpp]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP,
+  },
   [Feature.OverlayAnalysisCodeScanningCsharp]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_CSHARP",
@@ -229,6 +237,11 @@ export const featureConfig = {
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CODE_SCANNING_RUBY",
     minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_RUBY,
   },
+  [Feature.OverlayAnalysisCpp]: {
+    defaultValue: false,
+    envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CPP",
+    minimumVersion: CODEQL_OVERLAY_MINIMUM_VERSION_CPP,
+  },
   [Feature.OverlayAnalysisCsharp]: {
     defaultValue: false,
     envVar: "CODEQL_ACTION_OVERLAY_ANALYSIS_CSHARP",
diff --git a/src/overlay/index.ts b/src/overlay/index.ts
index 3b45a60d44..63a46b2b39 100644
--- a/src/overlay/index.ts
+++ b/src/overlay/index.ts
@@ -35,6 +35,7 @@ export const CODEQL_OVERLAY_MINIMUM_VERSION = "2.23.8";
 
 // Per-language minimum CLI versions for overlay analysis, based on release
 // validation data.
+export const CODEQL_OVERLAY_MINIMUM_VERSION_CPP = "2.25.0";
 export const CODEQL_OVERLAY_MINIMUM_VERSION_CSHARP = "2.24.1";
 export const CODEQL_OVERLAY_MINIMUM_VERSION_GO = "2.24.2";
 export const CODEQL_OVERLAY_MINIMUM_VERSION_JAVA = "2.23.8";