From c874f72ae253e008981dcae0fcd593ece685817f Mon Sep 17 00:00:00 2001
From: Alastair Robertson <ajor@meta.com>
Date: Thu, 14 Dec 2023 08:39:16 -0800
Subject: [PATCH] OID: Make CodeGen v2 (TypeGraph) the default

---
 .circleci/config.yml | 22 ++++++++++++----------
 oi/OID.cpp           |  1 +
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 80439f8..0a75d99 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,15 +10,16 @@ workflows:
           cc: /usr/bin/gcc
           cxx: /usr/bin/g++
           warnings_as_errors: "OFF"
+      - test:
+          name: test-codegenv1-gcc
+          requires:
+            - build-gcc
+          oid_test_args: "-Ftype-graph"
+          tests_regex: "OilIntegration\\..*"
       - test:
           name: test-gcc
           requires:
             - build-gcc
-      - test:
-          name: test-type-graph-gcc
-          requires:
-            - build-gcc
-          oid_test_args: "-ftype-graph"
           tests_regex: "OidIntegration\\..*"
           exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0"
       - coverage:
@@ -26,9 +27,9 @@ workflows:
           requires:
             - test-gcc
       - coverage:
-          name: coverage-type-graph
+          name: coverage-codegenv1
           requires:
-            - test-type-graph-gcc
+            - test-codegenv1-gcc
 
       - build:
           name: build-clang
@@ -36,16 +37,17 @@ workflows:
           cxx: /usr/bin/clang++-12
           warnings_as_errors: "ON"
       - test:
-          name: test-clang
+          name: test-codegenv1-clang
           requires:
             - build-clang
+          oid_test_args: "-Ftype-graph"
+          tests_regex: "OilIntegration\\..*"
           # Tests disabled due to bad DWARF generated by the old clang compiler in CI
           exclude_regex: "OilIntegration.fbstring_.*|OilIntegration.capture_keys_string|OilIntegration.capture_keys_multi_level"
       - test:
-          name: test-type-graph-clang
+          name: test-clang
           requires:
             - build-clang
-          oid_test_args: "-ftype-graph"
           tests_regex: "OidIntegration\\..*"
           # Tests disabled due to bad DWARF generated by the old clang compiler in CI
           exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0|.*fbstring.*|.*std_string_*|.*multi_arg_tb_.*|.*ignored_a"
diff --git a/oi/OID.cpp b/oi/OID.cpp
index 6403b61..c360c0a 100644
--- a/oi/OID.cpp
+++ b/oi/OID.cpp
@@ -516,6 +516,7 @@ int main(int argc, char* argv[]) {
   std::map<Feature, bool> features = {
       {Feature::PackStructs, true},
       {Feature::GenPaddingStats, true},
+      {Feature::TypeGraph, true},
       {Feature::PruneTypeGraph, true},
   };