Merge branch 'main' into exit-if-invalid

markshannon · Nov 9, 2023 · Nov 1, 2023 · Nov 1, 2023 · Nov 1, 2023 · Nov 3, 2023
commit 62d5e68ba19261b421eb0dc6e7cd58619ea3cc09
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -6153,7 +6153,6 @@ int_is_integer_impl(PyObject *self)
     Py_RETURN_TRUE;
 }
 
-
 static PyObject *
 long_vectorcall(PyObject *type, PyObject * const*args,
                  size_t nargsf, PyObject *kwnames)
@@ -6172,7 +6171,8 @@ long_vectorcall(PyObject *type, PyObject * const*args,
             return long_new_impl(_PyType_CAST(type), args[0], args[1]);
         default:
             return PyErr_Format(PyExc_TypeError,
-            "int expected at most 2 argument%s, got %zd", nargs);
+                                "int expected at most 2 argument%s, got %zd",
+                                nargs);
     }
 }
 

@@ -4034,7 +4034,7 @@ dummy_func(
 
         op(_CHECK_VALIDITY, (--)) {
             TIER_TWO_ONLY
-            DEOPT_IF(!self->base.vm_data.valid);
+            DEOPT_IF(!current_executor->base.vm_data.valid);
         }
 
 

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h