Merge branch 'main' into enum-docs

Author: ethanfurman

Include/internal/pycore_dict.h

@@ -272,8 +272,7 @@ _PyDict_SendEvent(int watcher_bits,
                   PyObject *value);
 
 static inline void
-_PyDict_NotifyEvent(PyInterpreterState *interp,
-                    PyDict_WatchEvent event,
+_PyDict_NotifyEvent(PyDict_WatchEvent event,
                     PyDictObject *mp,
                     PyObject *key,
                     PyObject *value)

Include/internal/pycore_opcode_metadata.h

@@ -2988,6 +2988,24 @@ class Obj:
         for _ in range(TIER2_THRESHOLD+1):
             obj.attr = EvilAttr(obj.__dict__)
 
+    def test_binary_subscr_list_int(self):
+        def testfunc(n):
+            l = [1]
+            x = 0
+            for _ in range(n):
+                y = l[0]
+                x += y
+            return x
+
+        res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
+        self.assertEqual(res, TIER2_THRESHOLD)
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+
+        self.assertIn("_BINARY_OP_SUBSCR_LIST_INT", uops)
+        self.assertNotIn("_POP_TOP", uops)
+        self.assertNotIn("_POP_TOP_INT", uops)
+        self.assertIn("_POP_TOP_NOP", uops)
 
 def global_identity(x):
     return x

Include/internal/pycore_uop_ids.h

@@ -759,7 +759,7 @@ def test_normalization(self):
 
     @requires_resource('cpu')
     def test_normalization_3_2_0(self):
-        testdatafile = findfile('NormalizationTest-3.2.0.txt', 'data')
+        testdatafile = findfile('NormalizationTest-3.2.0.txt')
         with open(testdatafile, encoding='utf-8') as testdata:
             self.run_normalization_tests(testdata, unicodedata.ucd_3_2_0)
 

Include/internal/pycore_uop_metadata.h

@@ -0,0 +1,2 @@
+Make concurrent iteration over the same range iterator thread-safe in the
+free threading build.