Merge branch 'main' into to_bool_specialization

Author: eendebakpt

Include/internal/pycore_uop_ids.h

@@ -2225,6 +2225,7 @@ c_void_p_from_param_impl(PyObject *type, PyTypeObject *cls, PyObject *value)
 static int
 set_stginfo_ffi_type_pointer(StgInfo *stginfo, struct fielddesc *fmt)
 {
+#if defined(_Py_FFI_SUPPORT_C_COMPLEX)
     if (!fmt->pffi_type->elements) {
         stginfo->ffi_type_pointer = *fmt->pffi_type;
     }
@@ -2244,6 +2245,10 @@ set_stginfo_ffi_type_pointer(StgInfo *stginfo, struct fielddesc *fmt)
         memcpy(stginfo->ffi_type_pointer.elements,
                fmt->pffi_type->elements, els_size);
     }
+#else
+    assert(!fmt->pffi_type->elements);
+    stginfo->ffi_type_pointer = *fmt->pffi_type;
+#endif
     return 0;
 }
 

Include/internal/pycore_uop_metadata.h

@@ -6129,6 +6129,13 @@ dummy_func(
             value = PyStackRef_FromPyObjectBorrow(ptr);
         }
 
+        tier2 pure op(_RROT_3, (bottom, middle, top -- bottom, middle, top)) {
+            _PyStackRef temp = top;
+            top = middle;
+            middle = bottom;
+            bottom = temp;
+        }
+
         tier2 op(_START_EXECUTOR, (executor/4 --)) {
 #ifndef _Py_JIT
             assert(current_executor == (_PyExecutorObject*)executor);

Modules/_ctypes/_ctypes.c

@@ -998,6 +998,13 @@ dummy_func(void) {
         assert(oparg >= 2);
     }
 
+    op(_RROT_3, (bottom, middle, top -- bottom, middle, top)) {
+        JitOptRef temp = top;
+        top = middle;
+        middle = bottom;
+        bottom = temp;
+    }
+
     op(_LOAD_ATTR_INSTANCE_VALUE, (offset/1, owner -- attr, o)) {
         attr = sym_new_not_null(ctx);
         (void)offset;

Python/bytecodes.c

@@ -258,8 +258,7 @@ def replace_opcode_if_evaluates_pure(
                     # usually for binary ops with passthrough references
                     2: [("_LOAD_CONST_INLINE_BORROW",
                          "0, (uintptr_t)result"),
-                        ("_SWAP", "3, 0"),
-                        ("_SWAP", "2, 0")],
+                        ("_RROT_3", "0, 0")],
                 },
             }