[pull] main from python:main

Doc/library/mmap.rst

@@ -346,7 +346,7 @@ To map anonymous memory, -1 should be passed as the fileno along with the length
 
       .. availability:: Linux >= 5.17 (kernel built with ``CONFIG_ANON_VMA_NAME`` option)
 
-      .. versionadded:: next
+      .. versionadded:: 3.15
 
    .. method:: size()
 

Include/patchlevel.h

@@ -24,10 +24,10 @@
 #define PY_MINOR_VERSION        15
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL       3
+#define PY_RELEASE_SERIAL       4
 
 /* Version as a string */
-#define PY_VERSION              "3.15.0a3+"
+#define PY_VERSION              "3.15.0a4+"
 /*--end constants--*/
 
 

Lib/test/support/__init__.py

@@ -1781,7 +1781,7 @@ def skip_if_unlimited_stack_size(test):
 
     See https://github.com/python/cpython/issues/143460.
     """
-    if is_wasi or os.name == "nt":
+    if is_emscripten or is_wasi or os.name == "nt":
         return test
 
     import resource

Lib/test/test_capi/test_opt.py

@@ -3575,6 +3575,42 @@ def testfunc(n):
         # _POP_TOP_NOP is a sign the optimizer ran and didn't hit bottom.
         self.assertGreaterEqual(count_ops(ex, "_POP_TOP_NOP"), 1)
 
+    def test_binary_op_subscr_init_frame(self):
+        class B:
+            def __getitem__(self, other):
+                return other + 1
+        def testfunc(*args):
+            n, b = args[0]
+            for _ in range(n):
+                y = b[2]
+
+        res, ex = self._run_with_optimizer(testfunc, (TIER2_THRESHOLD, B()))
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+
+        self.assertIn("_BINARY_OP_SUBSCR_INIT_CALL", uops)
+        # _POP_TOP_NOP is a sign the optimizer ran and didn't hit contradiction.
+        self.assertGreaterEqual(count_ops(ex, "_POP_TOP_NOP"), 1)
+
+    def test_load_attr_property_frame(self):
+        class B:
+            @property
+            def prop(self):
+                return 3
+        def testfunc(*args):
+            n, b = args[0]
+            for _ in range(n):
+                y = b.prop + b.prop
+
+        testfunc((3, B()))
+        res, ex = self._run_with_optimizer(testfunc, (TIER2_THRESHOLD, B()))
+        self.assertIsNotNone(ex)
+        uops = get_opnames(ex)
+
+        self.assertIn("_LOAD_ATTR_PROPERTY_FRAME", uops)
+        # This is a sign the optimizer ran and didn't hit contradiction.
+        self.assertIn("_INSERT_2_LOAD_CONST_INLINE_BORROW", uops)
+
     def test_unary_negative(self):
         def testfunc(n):
             a = 3