Keep test_frozenmain.h stable

Author: colesbury

Objects/codeobject.c

@@ -105,7 +105,16 @@ PyCode_ClearWatcher(int watcher_id)
 static int
 should_intern_string(PyObject *o)
 {
-#ifndef Py_GIL_DISABLED
+#ifdef Py_GIL_DISABLED
+    // The free-threaded build interns (and immortalizes) all string constants
+    // unless we've disabled immortalizing objects that use deferred reference
+    // counting.
+    PyInterpreterState *interp = _PyInterpreterState_GET();
+    if (!interp->gc.immortalize.enable_on_thread_created) {
+        return 1;
+    }
+#endif
+
     // compute if s matches [a-zA-Z0-9_]
     const unsigned char *s, *e;
 
@@ -118,7 +127,6 @@ should_intern_string(PyObject *o)
         if (!Py_ISALNUM(*s) && *s != '_')
             return 0;
     }
-#endif
     return 1;
 }
 

Programs/freeze_test_frozenmain.py

@@ -2,6 +2,7 @@
 import tokenize
 import os.path
 import sys
+from test.support import suppress_immortalization
 
 PROGRAM_DIR = os.path.dirname(__file__)
 SRC_DIR = os.path.dirname(PROGRAM_DIR)
@@ -24,7 +25,11 @@ def dump(fp, filename, name):
 
     with tokenize.open(filename) as source_fp:
         source = source_fp.read()
-        code = compile(source, code_filename, 'exec')
+        # The output of marshal can depend on the reference count so suppress
+        # immortalization in the free-threaded build to keep the output
+        # consistent with the default build.
+        with suppress_immortalization():
+            code = compile(source, code_filename, 'exec')
 
     data = marshal.dumps(code)
     writecode(fp, name, data)