Phase 3 Batch 5: static_method_stack_ Class B-kept closure (P-strict)

SonicField · SonicField · commit 782d56d0c6e1 · 2026-04-23T17:33:55.000-07:00
Rename hir_builder_static_method_stack_pop_c to hir_builder_state_static_method_stack_pop_cpp, aligning with the state-bridge _cpp suffix convention established in Batch 2 (Phase 3 exception_table_) and Batch 4 (block_map_). Decl moved from the legacy extern "C" block in builder.h to builder_state_c.h alongside other state bridges. Class B-kept disposition for static_method_stack_ (jit::Stack<Register*>) now 100% closed: - Pop side: hir_builder_state_static_method_stack_pop_cpp bridge (renamed) + 1 C-side caller in builder_emit_c.c (emitInvokeMethod static-typed branch) - Push side: stays C++-direct from C++ method context (builder.cpp:3449); no C-side push-caller materialized, push_cpp bridge deferred per as-needed discipline (theologian 00:28:34Z + supervisor 00:28:51Z, Batch 4 precedent). ZERO new bridges (pure rename). NO opaque pointer added to PhxHirBuilderState (Class B-kept per Batch 4 precedent: bridge available, struct doc-comment notes "in spirit"; subsequent Phase 3 closure amendment per pythia python#94 (3) will explicitly declare keep-bias as final HirBuilder state disposition). Numstat (vs HEAD eb3cdf3): Python/jit/hir/builder.cpp +1 -1 (extern "C" decl rename) Python/jit/hir/builder.h +1 -2 (delete legacy extern; rename friend) Python/jit/hir/builder_emit_c.c +3 -3 (extern + 1 caller + 1 doc-comment rename) Python/jit/hir/builder_state_c.h +9 -0 (NEW decl with state- bridge naming + history) scripts/w45_bridge_drift_falsifier.sh +1 -0 (1 new fixture) TOTAL: NET +9L (forecast +10L; -1L variance, ~10%, under threshold). W45 fixture: 1 new (state_static_method_stack_pop_cpp) added per shepard 22:46:33Z same-commit discipline. Dry-run: 14/14 fixtures stage cleanly. Pre-commit compile-check: testkeeper 00:33:26Z BUILD_EXIT=0, 3-test sanity green (partial_conversions + W22 + W44). W44 gate: PASS. Authorization: theologian 00:28:34Z (P-strict over P-pre-emptive per as-needed consistency) + supervisor 00:28:51Z (DISPOSITION GO P-strict).
diff --git a/Python/jit/hir/builder.cpp b/Python/jit/hir/builder.cpp
@@ -3494,7 +3494,7 @@ extern "C" void hir_builder_setup_static_args_c(
   }
 }
 
-extern "C" void *hir_builder_static_method_stack_pop_c(void *builder) {
+extern "C" void *hir_builder_state_static_method_stack_pop_cpp(void *builder) {
   auto *self = static_cast<HIRBuilder*>(builder);
   return self->static_method_stack_.pop();
 }
diff --git a/Python/jit/hir/builder.h b/Python/jit/hir/builder.h
@@ -40,7 +40,6 @@ int hir_builder_try_emit_direct_method_call_c(
 void hir_builder_setup_static_args_c(
     void *builder, void *tc, PyObject *descr, long nargs, int statically_typed,
     void **out_arg_regs, size_t *out_count);
-void *hir_builder_static_method_stack_pop_c(void *builder);
 
 /* W26 (theologian L2462+L2466): bridges for emitAnyCall full conversion +
  * 149b7e2d40 PartialConversion reabsorb. 4 NEW bridges: combined exception-
@@ -190,7 +189,7 @@ class HIRBuilder {
       void*, void*, PyObject*, long);
   friend void ::hir_builder_setup_static_args_c(
       void*, void*, PyObject*, long, int, void**, size_t*);
-  friend void* ::hir_builder_static_method_stack_pop_c(void*);
+  friend void* ::hir_builder_state_static_method_stack_pop_cpp(void*);
   // INVOKE_* Phase 2 #3 (theologian L2430): function-target variants for
   // emitInvokeFunction C body.
   friend void ::hir_builder_invoke_function_target_c(
diff --git a/Python/jit/hir/builder_emit_c.c b/Python/jit/hir/builder_emit_c.c
@@ -2549,7 +2549,7 @@ bool hir_builder_emit_invoke_function_c(
  *   - hir_builder_invoke_method_target_c (InvokeTarget query)
  *   - hir_builder_try_emit_direct_method_call_c (path 1)
  *   - hir_builder_setup_static_args_c (arg_regs)
- *   - hir_builder_static_method_stack_pop_c (entry pop) */
+ *   - hir_builder_state_static_method_stack_pop_cpp (entry pop) */
 extern void hir_builder_invoke_method_target_c(
     void *builder, PyObject *descr,
     int *out_is_builtin, int *out_is_statically_typed, HirType *out_return_type);
@@ -2558,7 +2558,7 @@ extern int hir_builder_try_emit_direct_method_call_c(
 extern void hir_builder_setup_static_args_c(
     void *builder, void *tc, PyObject *descr, long nargs, int statically_typed,
     void **out_arg_regs, size_t *out_count);
-extern void *hir_builder_static_method_stack_pop_c(void *builder);
+extern void *hir_builder_state_static_method_stack_pop_cpp(void *builder);
 
 bool hir_builder_emit_invoke_method_c(
         PhxTranslationContext *tc,
@@ -2589,7 +2589,7 @@ bool hir_builder_emit_invoke_method_c(
         /* AllocateNonStack equivalent: hir_func_alloc_register
          * (TempAllocator::AllocateNonStack just calls env->AllocateRegister). */
         void *out = hir_func_alloc_register(func);
-        void *entry = hir_builder_static_method_stack_pop_c(builder);
+        void *entry = hir_builder_state_static_method_stack_pop_cpp(builder);
         void *invoke = hir_c_create_call_ind_reg2(
             (size_t)nargs + 1, out, "vtable invoke", return_type);
         hir_c_set_operand(invoke, 0, entry);
diff --git a/Python/jit/hir/builder_state_c.h b/Python/jit/hir/builder_state_c.h
@@ -98,6 +98,15 @@ void *hir_builder_state_block_map_blocks_lookup_cpp(
     void *builder,
     int off);
 
+/* Phase 3 Batch 5 (P-strict) Class B-kept disposition closure for
+ * static_method_stack_ (jit::Stack<Register*>): pop the top entry and
+ * return it. Renamed from hir_builder_static_method_stack_pop_c to
+ * align with state-bridge _cpp suffix convention (Batch 2 + 4 precedent).
+ * The push side stays C++-direct from C++ method context (1 site at
+ * builder.cpp:3449); push_cpp bridge deferred per as-needed discipline
+ * (theologian 00:28:34Z + supervisor 00:28:51Z). */
+void *hir_builder_state_static_method_stack_pop_cpp(void *builder);
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/scripts/w45_bridge_drift_falsifier.sh b/scripts/w45_bridge_drift_falsifier.sh
@@ -100,6 +100,7 @@ FIXTURES=(
     "hir_builder_state_exception_table_entry_cpp|Phase 3 Batch 2 exception_table entry bridge (7 args)"
     "hir_builder_state_find_exception_handler_c|Phase 3 Batch 2 findExceptionHandler C body (4 args)"
     "hir_builder_state_block_map_blocks_lookup_cpp|Phase 3 Batch 4 block_map blocks lookup bridge (2 args)"
+    "hir_builder_state_static_method_stack_pop_cpp|Phase 3 Batch 5 static_method_stack pop bridge (1 arg)"
 )
 
 # Mutation: append ', int phx_w45_drift' before the closing paren of the

Original file line number	Diff line number	Diff line change
`@@ -3494,7 +3494,7 @@ extern "C" void hir_builder_setup_static_args_c(`
`3494`	`3494`	`}`
`3495`	`3495`	`}`
`3496`	`3496`
`3497`		`-extern "C" void hir_builder_static_method_stack_pop_c(void builder) {`
	`3497`	`+extern "C" void hir_builder_state_static_method_stack_pop_cpp(void builder) {`
`3498`	`3498`	`auto self = static_cast<HIRBuilder>(builder);`
`3499`	`3499`	`return self->static_method_stack_.pop();`
`3500`	`3500`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ FIXTURES=(`
`100`	`100`	`"hir_builder_state_exception_table_entry_cpp\|Phase 3 Batch 2 exception_table entry bridge (7 args)"`
`101`	`101`	`"hir_builder_state_find_exception_handler_c\|Phase 3 Batch 2 findExceptionHandler C body (4 args)"`
`102`	`102`	`"hir_builder_state_block_map_blocks_lookup_cpp\|Phase 3 Batch 4 block_map blocks lookup bridge (2 args)"`
	`103`	`+ "hir_builder_state_static_method_stack_pop_cpp\|Phase 3 Batch 5 static_method_stack pop bridge (1 arg)"`
`103`	`104`	`)`
`104`	`105`
`105`	`106`	`# Mutation: append ', int phx_w45_drift' before the closing paren of the`