Revert "simplify: fully port GetLength to C + fix PrimitiveBox signatures"

This reverts commit 88bef34.

Author: SonicField

Python/jit/hir/simplify.cpp

@@ -2772,12 +2772,8 @@ Register* simplifyInstr(Env& env, const Instr* instr) {
       return r;
     }
 
-    case Opcode::kGetLength: {
-      SimplifyEnv cenv = make_c_env();
-      auto *r = static_cast<Register*>(simplify_get_length_c(&cenv, instr));
-      sync_c_env(cenv);
-      return r;
-    }
+    case Opcode::kGetLength:
+      return simplifyGetLength(env, instr);
 
     case Opcode::kIntConvert: {
       SimplifyEnv cenv = make_c_env();

Python/jit/hir/simplify_c.c

@@ -115,8 +115,9 @@ void *simplify_env_emit_long_compare(SimplifyEnv *env, int32_t op,
 
 void *simplify_env_emit_primitive_box_bool(SimplifyEnv *env, void *src) {
     void *reg = hir_func_alloc_register(env->func);
-    extern void *hir_c_create_primitive_box_bool_reg(void *dst, void *src);
-    void *instr = hir_c_create_primitive_box_bool_reg(reg, src);
+    extern void *hir_c_create_primitive_box(void *dst, void *src, HirType type);
+    HirType t_cbool = HIR_TYPE_CBOOL;
+    void *instr = hir_c_create_primitive_box(reg, src, t_cbool);
     return simplify_env_emit(env, instr);
 }
 
@@ -198,23 +199,6 @@ void *simplify_env_emit_check_neg(SimplifyEnv *env, void *src, void *frame_state
     return simplify_env_emit(env, instr);
 }
 
-/* ---- simplifyGetLength ----
- * If obj is a collection with known length field, emit LoadField + PrimitiveBox. */
-void *simplify_get_length_c(SimplifyEnv *env, const void *instr) {
-    void *obj = hir_c_get_operand(instr, 0);
-    void *size = emit_get_length_int64_c(env, obj);
-    if (size == NULL) return NULL;
-
-    void *fs = hir_c_get_frame_state(instr);
-    HirType t_cint64 = HIR_TYPE_CINT64;
-    extern void *hir_c_create_primitive_box_reg(void *dst, void *src, HirType type);
-    void *dst_reg = hir_func_alloc_register(env->func);
-    void *box = hir_c_create_primitive_box_reg(dst_reg, size, t_cint64);
-    extern void hir_c_copy_frame_state(void *dst, void *src);
-    hir_c_copy_frame_state(box, (void *)instr);
-    return simplify_env_emit(env, box);
-}
-
 /* ---- simplifyStoreSubscr ----
  * If target is DictExact, call mp_ass_subscript directly + check_neg. */
 void *simplify_store_subscr_c(SimplifyEnv *env, const void *instr) {

Python/jit/hir/simplify_c.h

@@ -45,7 +45,6 @@ void *simplify_cint_to_cbool_c(SimplifyEnv *env, const void *instr);
 void *simplify_cond_branch_const_c(SimplifyEnv *env, const void *instr);
 void *simplify_compare_c(SimplifyEnv *env, const void *instr);
 void *simplify_is_neg_and_err_c(SimplifyEnv *env, const void *instr);
-void *simplify_get_length_c(SimplifyEnv *env, const void *instr);
 void *simplify_store_subscr_c(SimplifyEnv *env, const void *instr);
 void *simplify_load_var_object_size_c(SimplifyEnv *env, const void *instr);