python · nascheme · Mar 3, 2021 · Mar 3, 2021
diff --git a/Lib/ctypes/test/test_values.py b/Lib/ctypes/test/test_values.py
@@ -80,9 +80,9 @@ class struct_frozen(Structure):
                continue
            items.append((entry.name.decode("ascii"), entry.size))

-        expected = [("__hello__", 125),
-                    ("__phello__", -125),
-                    ("__phello__.spam", 125),
+        expected = [("__hello__", 129),
+                    ("__phello__", -129),
+                    ("__phello__.spam", 129),
                    ]
        self.assertEqual(items, expected, "PyImport_FrozenModules example "
            "in Doc/library/ctypes.rst may be out of date")

diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -871,9 +871,13 @@ regen-opcode:
 	$(UPDATE_FILE) $(srcdir)/Include/opcode.h $(srcdir)/Include/opcode.h.new

 .PHONY: regen-frozen
-regen-frozen:
+regen-frozen: build_all
 	# Regenerate code for frozen module "__hello__".
-	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/freeze/regen_frozen.py $(srcdir)/Python/frozen_hello.h
+	$(RUNSHARED) ./$(BUILDPYTHON) \
+		$(srcdir)/Tools/freeze/regen_frozen.py \
+		$(srcdir)/Python/frozen_hello.h.new
+	$(UPDATE_FILE) $(srcdir)/Python/frozen_hello.h \
+		$(srcdir)/Python/frozen_hello.h.new

 .PHONY: regen-token
 regen-token:

diff --git a/Misc/NEWS.d/next/Build/2021-03-02-18-24-51.bpo-43372.HvwNkL.rst b/Misc/NEWS.d/next/Build/2021-03-02-18-24-51.bpo-43372.HvwNkL.rst
@@ -0,0 +1,4 @@
+Change the regen-frozen target to use BUILDPYTHON rather than
+PYTHON_FOR_REGEN. The marshaled data for code objects has changed with
+bpo-42246, commit 877df85. Update the frozen code for ``__hello__`` and update
+the expected code sizes in ctypes test_frozentable.
diff --git a/Python/frozen_hello.h b/Python/frozen_hello.h
@@ -9,5 +9,5 @@ static unsigned char M___hello__[] = {
    100,218,5,112,114,105,110,116,169,0,114,2,0,
    0,0,114,2,0,0,0,218,4,110,111,110,101,
    218,8,60,109,111,100,117,108,101,62,1,0,0,
-    0,115,2,0,0,0,4,1,
+    0,115,6,0,0,0,4,0,12,1,255,128,
 };