gh-135228: Properly update closure cells for __setattr__ and __detattr__ in frozen dataclasses with slots

Lib/dataclasses.py

@@ -725,25 +725,25 @@ def _init_fn(fields, std_fields, kw_only_fields, frozen, has_post_init,
                         annotation_fields=annotation_fields)
 
 
-def _frozen_get_del_attr(cls, fields, func_builder):
-    locals = {'cls': cls,
+def _frozen_set_del_attr(cls, fields, func_builder):
+    locals = {'__class__': cls,
               'FrozenInstanceError': FrozenInstanceError}
-    condition = 'type(self) is cls'
+    condition = 'type(self) is __class__'
     if fields:
         condition += ' or name in {' + ', '.join(repr(f.name) for f in fields) + '}'
 
     func_builder.add_fn('__setattr__',
                         ('self', 'name', 'value'),
                         (f'  if {condition}:',
                           '   raise FrozenInstanceError(f"cannot assign to field {name!r}")',
-                         f'  super(cls, self).__setattr__(name, value)'),
+                         f'  super(__class__, self).__setattr__(name, value)'),
                         locals=locals,
                         overwrite_error=True)
     func_builder.add_fn('__delattr__',
                         ('self', 'name'),
                         (f'  if {condition}:',
                           '   raise FrozenInstanceError(f"cannot delete field {name!r}")',
-                         f'  super(cls, self).__delattr__(name)'),
+                         f'  super(__class__, self).__delattr__(name)'),
                         locals=locals,
                         overwrite_error=True)
 
@@ -1199,7 +1199,7 @@ def _process_class(cls, init, repr, eq, order, unsafe_hash, frozen,
                             overwrite_error='Consider using functools.total_ordering')
 
     if frozen:
-        _frozen_get_del_attr(cls, field_list, func_builder)
+        _frozen_set_del_attr(cls, field_list, func_builder)
 
     # Decide if/how we're going to create a hash function.
     hash_action = _hash_action[bool(unsafe_hash),

Lib/test/test_dataclasses/__init__.py

@@ -3971,6 +3971,13 @@ class SlotsTest:
 
             return SlotsTest
 
+        def make_frozen():
+            @dataclass(frozen=True, slots=True)
+            class SlotsTest:
+                pass
+
+            return SlotsTest
+
         def make_with_annotations():
             @dataclass(slots=True)
             class SlotsTest:
@@ -3996,14 +4003,39 @@ class SlotsTest:
 
             return SlotsTest
 
-        for make in (make_simple, make_with_annotations, make_with_annotations_and_method, make_with_forwardref):
+        for make in (make_simple, make_frozen, make_with_annotations, make_with_annotations_and_method, make_with_forwardref):
             with self.subTest(make=make):
                 C = make()
                 support.gc_collect()
                 candidates = [cls for cls in object.__subclasses__() if cls.__name__ == 'SlotsTest'
                               and cls.__firstlineno__ == make.__code__.co_firstlineno + 1]
                 self.assertEqual(candidates, [C])
 
+    def test_set_del_attr_reference_new_class(self):
+        @dataclass(frozen=True, slots=True)
+        class SetDelAttrTest:
+            pass
+
+        for method_name in ('__setattr__', '__delattr__'):
+            with self.subTest(method_name=method_name):
+                method = getattr(SetDelAttrTest, method_name)
+                cell_idx = method.__code__.co_freevars.index('__class__')
+                reference = method.__closure__[cell_idx].cell_contents
+                self.assertIs(reference, SetDelAttrTest)
+
+    def test_set_del_attr_do_not_reference_old_class(self):
+        class SetDelAttrTest:
+            pass
+
+        OriginalCls = SetDelAttrTest
+        SetDelAttrTest = dataclass(frozen=True, slots=True)(SetDelAttrTest)
+
+        for method_name in ('__setattr__', '__delattr__'):
+            with self.subTest(method_name=method_name):
+                method = getattr(SetDelAttrTest, method_name)
+                cell_contents = [cell.cell_contents for cell in method.__closure__]
+                self.assertNotIn(OriginalCls, cell_contents)
+
 
 class TestDescriptors(unittest.TestCase):
     def test_set_name(self):