Phase 1 python#8: emitSetupWithCommon dead-code delete

SonicField · SonicField · commit e05a3589dd87 · 2026-04-23T15:50:44.000-07:00
Phase 1 python#6 (emitBeforeWith) + python#7 (emitSetupWith) both folded their PY_VERSION_HEX conditional + C++ wrapper logic INTO the C body, and their callers now invoke hir_builder_emit_setup_with_common_c (the internal C-bridge helper) directly from C — bypassing the C++ method HIRBuilder::emitSetupWithCommon entirely. That made the C++ wrapper DEAD: zero production callers. Delete: builder.cpp: -21L (15L method def + 3L extern decl + 3L blanks) builder.h: -10L (decl removed) builder_emit_c.c: +4 -5 (stale doc comment refresh — drop W27c tag + C++ method back-reference) NET: -32L pure deletion (no fold-into-C, no sig mutation). The C body hir_builder_emit_setup_with_common_c is RETAINED — used internally by hir_builder_emit_setup_with_c (Phase 1 python#7) and hir_builder_emit_before_with_c (Phase 1 python#6) as a .c→.c helper. Authorization: theologian 22:49:41Z (cross-check PASS, exhaustive caller enumeration via grep -rnE '\bemitSetupWithCommon\b' Python Include Lib/test → 0 production callers) + supervisor 22:49:52Z (GO Step B). W45 fixture exemption justified per theologian 22:49:41Z: shepard 22:46:33Z discipline applies to fold-into-C / sig-mutation; delete-of-dead-code is neither (same precedent as Phase 1 python#1 INVOKE_* delegation-stub deletes). W44 gate: PASS (2 markers, 0 production callers).
diff --git a/Python/jit/hir/builder.cpp b/Python/jit/hir/builder.cpp
@@ -4267,27 +4267,6 @@ void HIRBuilder::emitGetANext(TranslationContext& tc) {
       static_cast<void*>(&tc), static_cast<void*>(current_func_));
 }
 
-extern "C" void hir_builder_emit_setup_with_common_c(
-    void *tc, void *builder, void *enter_id, void *exit_id,
-    int is_async, void **out_enter_result);
-
-Register* HIRBuilder::emitSetupWithCommon(
-    TranslationContext& tc,
-#if PY_VERSION_HEX < 0x030C0000
-    _Py_Identifier* enter_id,
-    _Py_Identifier* exit_id,
-#else
-    PyObject* enter_id,
-    PyObject* exit_id,
-#endif
-    bool is_async) {
-  void *enter_result = nullptr;
-  hir_builder_emit_setup_with_common_c(
-      &tc, this, (void*)enter_id, (void*)exit_id, is_async ? 1 : 0,
-      &enter_result);
-  return static_cast<Register*>(enter_result);
-}
-
 extern "C" void hir_builder_emit_setup_async_with_c(void *tc, int handler_off);
 
 void HIRBuilder::emitSetupAsyncWith(
diff --git a/Python/jit/hir/builder.h b/Python/jit/hir/builder.h
@@ -471,16 +471,6 @@ class HIRBuilder {
   void emitEndAsyncFor(TranslationContext& tc);
   void emitGetAIter(TranslationContext& tc);
   void emitGetANext(TranslationContext& tc);
-  Register* emitSetupWithCommon(
-      TranslationContext& tc,
-#if PY_VERSION_HEX < 0x030C0000
-      _Py_Identifier* enter_id,
-      _Py_Identifier* exit_id,
-#else
-      PyObject* enter_id,
-      PyObject* exit_id,
-#endif
-      bool is_async);
   void emitSetupAsyncWith(
       TranslationContext& tc,
       const jit::BytecodeInstruction& bc_instr);
diff --git a/Python/jit/hir/builder_emit_c.c b/Python/jit/hir/builder_emit_c.c
@@ -4093,13 +4093,12 @@ void hir_builder_emit_primitive_load_const_c(
     (void)func;  /* unused; tc owns the emission */
 }
 
-/* W27c #1: emitSetupWithCommon — helper for emitSetupWith + emitBeforeWith.
- * Mirrors C++ HIRBuilder::emitSetupWithCommon @ builder.cpp:4534.
+/* emitSetupWithCommon — helper for emitSetupWith + emitBeforeWith.
  *
  * Loads __enter__ + __exit__ via emitLoadAttrSpecial, pushes exit, emits
- * VectorCall(enter), returns enter_result via out-param. PY_VERSION_HEX
- * conditional (_Py_Identifier vs PyObject*) folded in C++ stub: ids are
- * passed as opaque void*. is_async selects the error message text. */
+ * VectorCall(enter), returns enter_result via out-param. enter_id +
+ * exit_id are passed as opaque void* (caller picks _Py_Identifier* on
+ * pre-3.12 vs PyObject* on 3.12+). is_async selects error message text. */
 void hir_builder_emit_setup_with_common_c(
         PhxTranslationContext *tc,
         void *builder,
