From d4c4df995e0238d088a81cee8fc7f28da3650301 Mon Sep 17 00:00:00 2001
From: agammann <161159040+agammann@users.noreply.github.com>
Date: Sun, 20 Sep 2026 16:36:57 -0700
Subject: [PATCH] Preserve slotted class layouts during dynamic reconstruction

---
 cloudpickle/cloudpickle.py | 14 +++++++++++++-
 tests/cloudpickle_test.py  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/cloudpickle/cloudpickle.py b/cloudpickle/cloudpickle.py
index 08882306..b6bab3c4 100644
--- a/cloudpickle/cloudpickle.py
+++ b/cloudpickle/cloudpickle.py
@@ -671,8 +671,20 @@ def _make_dict_items(obj, is_ordered=False):
 
 def _class_getnewargs(obj):
     type_kwargs = {}
+    bases = _get_bases(obj)
     if "__module__" in obj.__dict__:
         type_kwargs["__module__"] = obj.__module__
+    # Slots must be present when the class is created: assigning __slots__
+    # afterward cannot restore the instance layout. NamedTuple creates its own
+    # slots and rejects an explicit __slots__ entry in the class namespace.
+    named_tuple_bases = (
+        typing.NamedTuple,
+        getattr(sys.modules.get("typing_extensions"), "NamedTuple", None),
+    )
+    if "__slots__" in obj.__dict__ and not any(
+        base in named_tuple_bases for base in bases
+    ):
+        type_kwargs["__slots__"] = obj.__slots__
 
     __dict__ = obj.__dict__.get("__dict__", None)
     if isinstance(__dict__, property):
@@ -681,7 +693,7 @@ def _class_getnewargs(obj):
     return (
         type(obj),
         obj.__name__,
-        _get_bases(obj),
+        bases,
         type_kwargs,
         _get_or_create_tracker_id(obj),
         None,
diff --git a/tests/cloudpickle_test.py b/tests/cloudpickle_test.py
index e2097d1c..77f7f6be 100644
--- a/tests/cloudpickle_test.py
+++ b/tests/cloudpickle_test.py
@@ -2313,6 +2313,38 @@ def test_type_hint(self):
         t = typing.Union[list, int]
         assert pickle_depickle(t) == t
 
+    def test_typing_extensions_namedtuple(self):
+        typing_extensions = pytest.importorskip("typing_extensions")
+
+        class MyTuple(typing_extensions.NamedTuple):
+            value: int
+
+        restored = subprocess_pickle_echo(MyTuple(42), protocol=self.protocol)
+        assert restored.value == 42
+        assert not hasattr(restored, "__dict__")
+
+    def test_slotted_class_layout_in_subprocess(self):
+        class Base:
+            __slots__ = ("base_value",)
+
+        class Child(Base):
+            __slots__ = ("child_value",)
+
+        obj = Child()
+        obj.base_value = 1
+        obj.child_value = 2
+
+        def check_layout(restored):
+            assert restored.base_value == 1
+            assert restored.child_value == 2
+            assert not hasattr(restored, "__dict__")
+            with pytest.raises(AttributeError):
+                restored.extra = 3
+            return restored.base_value + restored.child_value
+
+        with subprocess_worker(protocol=self.protocol) as worker:
+            assert worker.run(check_layout, obj) == 3
+
     def test_instance_with_slots(self):
         for slots in [["registered_attribute"], "registered_attribute"]: