W25 Step B-77a-fix: add canonical includes missing post-extern-delete

SonicField · SonicField · commit 0d1851d348ef · 2026-04-22T14:27:28.000-07:00
Per testkeeper [chat L<this>] x86_64 BUILD FAIL on 47f3170: 5 compile errors due to missing canonical includes. Function-scoped externs deleted in 77a but the parent files didn't all have canonical includes that cover the deleted-extern function declarations. ROOT CAUSE: my 77a deletion missed adding includes for 3 TUs. pass_output_type_c.c: had hir_c_api.h but not hir_cfg_rpo_c.h (hir_cfg_get_rpo_c lives in hir_cfg_rpo_c.h, separate file pair). refcount_insertion.cpp: had no canonical include for hir_cfg_split_critical_edges_c (just promoted to hir_c_api.h in 77a). refcount_env_bridge.cpp: had no hir_c_api.h or hir_cfg_rpo_c.h (needed for hir_cfg_get_rpo + hir_instr_is_deopt_base + hir_cfg_get_rpo_c). CHANGES (+5/0): pass_output_type_c.c: + #include "cinderx/Jit/hir/hir_cfg_rpo_c.h" refcount_insertion.cpp: + #include "cinderx/Jit/hir/hir_c_api.h" refcount_env_bridge.cpp: + 2 includes (hir_c_api.h + hir_cfg_rpo_c.h) VERIFICATION (per CLAUDE.md item (6) script-driven counts): Lint pattern still 0 violators (extern deletes survived). Compile errors should resolve since canonical decls now visible. DISCIPLINE NOTE: my 77a per-extern classification correctly identified Class A vs C2 vs C1, but I forgot to add the C2-helper-header includes to the 3 files that didn't already have them. Same lesson as B-5 function-scoped extern compile-time-discovery — check include presence when deleting externs whose canonical home isn't already #included. testkeeper STRICT verify (gate items 1-6 hardened) requested post-commit.
diff --git a/Python/jit/hir/pass_output_type_c.c b/Python/jit/hir/pass_output_type_c.c
@@ -10,6 +10,7 @@
  */
 
 #include "cinderx/Jit/hir/hir_c_api.h"
+#include "cinderx/Jit/hir/hir_cfg_rpo_c.h"
 #include "cinderx/Jit/hir/hir_instr_c.h"
 #include "cinderx/Jit/hir/hir_type_c.h"
 #include "cinderx/Jit/hir/hir_opcode_c.h"
diff --git a/Python/jit/hir/refcount_env_bridge.cpp b/Python/jit/hir/refcount_env_bridge.cpp
@@ -5,6 +5,8 @@
 
 #include "cinderx/Jit/hir/refcount_env_c.h"
 #include "cinderx/Jit/hir/refcount_structs_c.h"
+#include "cinderx/Jit/hir/hir_c_api.h"
+#include "cinderx/Jit/hir/hir_cfg_rpo_c.h"
 #include "cinderx/Jit/hir/hir.h"
 #include "cinderx/Jit/hir/function.h"
 #include "cinderx/Jit/hir/type.h"
diff --git a/Python/jit/hir/refcount_insertion.cpp b/Python/jit/hir/refcount_insertion.cpp
@@ -8,6 +8,7 @@ extern "C" void hir_phi_elimination_run(void *func);
 #include "cinderx/Jit/hir/refcount_insertion.h"
 #include "cinderx/Jit/hir/refcount_env_c.h"
 #include "cinderx/Jit/hir/refcount_pass_c.h"
+#include "cinderx/Jit/hir/hir_c_api.h"
 #include "cinderx/Jit/hir/hir_instr_c.h"
 #include "cinderx/Jit/hir/hir_type_c.h"
 #include "cinderx/Jit/jit_config_c.h"
