Merge branch 'main' into fix-150075-tar-addfile-no-offsets

Author: grantlouisherman

Lib/test/test_generated_cases.py

@@ -2187,6 +2187,75 @@ def test_family_member_needs_transform_only_when_shape_changes(self):
             "[OP_TYPED_SPECIALIZED] = {1, 0, {0}}",
         )
 
+    def test_record_transform_generated_from_recording_uop(self):
+        input = """
+        tier2 op(_RECORD_TOS, (tos -- tos)) {
+            RECORD_VALUE(PyStackRef_AsPyObjectBorrow(tos));
+        }
+        tier2 op(_RECORD_TOS_TYPE, (tos -- tos)) {
+            RECORD_VALUE(Py_TYPE(PyStackRef_AsPyObjectBorrow(tos)));
+        }
+        op(_DO_STUFF, (tos -- res)) {
+            res = tos;
+        }
+        macro(OP) = _RECORD_TOS + _DO_STUFF;
+        macro(OP_SPECIALIZED) = _RECORD_TOS_TYPE + _DO_STUFF;
+        family(OP, INLINE_CACHE_ENTRIES_OP) = { OP_SPECIALIZED };
+        """
+        output = self.generate_tables(input)
+        self.assertIn("_PyOpcode_RecordTransform_TOS_TYPE", output)
+        self.assertIn("tos = PyStackRef_FromPyObjectBorrow(recorded_value);", output)
+        self.assertIn(
+            "transformed_value = (PyObject *)Py_TYPE(PyStackRef_AsPyObjectBorrow(tos));",
+            output,
+        )
+        self.assertIn("return _PyOpcode_RecordTransform_TOS_TYPE(value);", output)
+        self.assertNotIn("record_trace_transform_to_type", output)
+
+    def test_record_transform_generated_when_only_specialization_records(self):
+        input = """
+        tier2 op(_RECORD_TOS_TYPE, (tos -- tos)) {
+            RECORD_VALUE(Py_TYPE(PyStackRef_AsPyObjectBorrow(tos)));
+        }
+        op(_DO_STUFF, (tos -- res)) {
+            res = tos;
+        }
+        macro(OP) = _DO_STUFF;
+        macro(OP_SPECIALIZED) = _RECORD_TOS_TYPE + _DO_STUFF;
+        family(OP, INLINE_CACHE_ENTRIES_OP) = { OP_SPECIALIZED };
+        """
+        output = self.generate_tables(input)
+        # Family head must adopt the specialization's recorder.
+        self.assertIn("[OP] = {1, {_RECORD_TOS_TYPE_INDEX}}", output)
+        self.assertIn("[OP_SPECIALIZED] = {1, {_RECORD_TOS_TYPE_INDEX}}", output)
+        # Specialization consumes the slot directly (mask 0), no transform.
+        self.assert_slot_map_lines(output, "[OP_SPECIALIZED] = {1, 0, {0}}")
+        self.assertNotIn("_PyOpcode_RecordTransform_TOS_TYPE(", output)
+
+    def test_no_record_transform_when_only_base_records(self):
+        input = """
+        tier2 op(_RECORD_TOS, (tos -- tos)) {
+            RECORD_VALUE(PyStackRef_AsPyObjectBorrow(tos));
+        }
+        op(_DO_STUFF, (tos -- res)) {
+            res = tos;
+        }
+        macro(OP) = _RECORD_TOS + _DO_STUFF;
+        macro(OP_SPECIALIZED) = _DO_STUFF;
+        family(OP, INLINE_CACHE_ENTRIES_OP) = { OP_SPECIALIZED };
+        """
+        output = self.generate_tables(input)
+        # Family head records via _RECORD_TOS.
+        self.assertIn("[OP] = {1, {_RECORD_TOS_INDEX}}", output)
+        self.assertIn("[OP_SPECIALIZED] = {1, {_RECORD_TOS_INDEX}}", output)
+        # Specialization has no consumer slot map entry (it doesn't read it).
+        self.assertNotIn(
+            "[OP_SPECIALIZED] = {1,", self.get_slot_map_section(output)
+        )
+        # No transform helpers are generated.
+        self.assertNotIn("_PyOpcode_RecordTransform_TOS(", output)
+        self.assertNotIn("_PyOpcode_RecordTransform_TOS_TYPE", output)
+
     def test_family_member_maps_positional_recorders_to_family_slots(self):
         input = """
         tier2 op(_RECORD_TOS, (sub -- sub)) {
@@ -2243,7 +2312,12 @@ def test_family_head_records_union_of_member_recorders(self):
         macro(OP_SPECIALIZED) = _RECORD_TOS + _DO_STUFF;
         family(OP, INLINE_CACHE_ENTRIES_OP) = { OP_SPECIALIZED };
         """
+        analysis = self.analyze_input(input)
         output = self.generate_tables(input)
+        self.assertEqual(
+            analysis.families["OP"].get_member_record_names(),
+            ("_RECORD_TOS",),
+        )
         self.assertIn("[OP] = {1, {_RECORD_TOS_INDEX}}", output)
         self.assertIn("[OP_SPECIALIZED] = {1, {_RECORD_TOS_INDEX}}", output)
         self.assert_slot_map_lines(output, "[OP_SPECIALIZED] = {1, 0, {0}}")

Python/optimizer.c

@@ -663,44 +663,6 @@ is_terminator(const _PyUOpInstruction *uop)
     );
 }
 
-static PyObject *
-record_trace_transform_to_type(PyObject *value)
-{
-    PyObject *tp = Py_NewRef((PyObject *)Py_TYPE(value));
-    Py_DECREF(value);
-    return tp;
-}
-
-/* _RECORD_NOS_GEN_FUNC and _RECORD_3OS_GEN_FUNC record the raw receiver.
- * If it is a generator, return its function object; otherwise return NULL.
- */
-static PyObject *
-record_trace_transform_gen_func(PyObject *value)
-{
-    PyObject *func = NULL;
-    if (PyGen_Check(value)) {
-        _PyStackRef f = ((PyGenObject *)value)->gi_iframe.f_funcobj;
-        if (!PyStackRef_IsNull(f)) {
-            func = Py_NewRef(PyStackRef_AsPyObjectBorrow(f));
-        }
-    }
-    Py_DECREF(value);
-    return func;
-}
-
-/* _RECORD_BOUND_METHOD records the raw callable.
- * Keep it only for bound methods; otherwise return NULL.
- */
-static PyObject *
-record_trace_transform_bound_method(PyObject *value)
-{
-    if (Py_TYPE(value) == &PyMethod_Type) {
-        return value;
-    }
-    Py_DECREF(value);
-    return NULL;
-}
-
 /* Returns 1 on success (added to trace), 0 on trace end.
  */
 // gh-142543: inlining this function causes stack overflows

Python/record_functions.c.h

@@ -322,6 +322,16 @@ class Family:
     size: str
     members: list[Instruction]
 
+    def get_member_record_names(self) -> tuple[str, ...]:
+        seen: set[str] = set()
+        names: list[str] = []
+        for member in self.members:
+            for part in member.parts:
+                if part.properties.records_value and part.name not in seen:
+                    seen.add(part.name)
+                    names.append(part.name)
+        return tuple(names)
+
     def dump(self, indent: str) -> None:
         print(indent, self.name, "= ", ", ".join([m.name for m in self.members]))