Replace MATCH_CLASS_ISINSTANCE with CALL_INTRINSIC_2

Co-Authored-By: Pieter Eendebak <pieter.eendebak@gmail.com>

Author: cdce8p

Doc/library/dis.rst

@@ -1755,14 +1755,6 @@ iterations of the loop.
    .. versionadded:: 3.13
 
 
-.. opcode:: MATCH_CLASS_ISINSTANCE
-
-   Read match subject ``Stack[-2]`` and the type object ``Stack[-1]`` from stack.
-   Pop ``Stack[-1]`` and push ``True`` or ``False`` for the result of :func:`isinstance`.
-
-   .. versionadded:: 3.15
-
-
 .. opcode:: MATCH_CLASS (count)
 
    ``STACK[-1]`` is a tuple of keyword attribute names, ``STACK[-2]`` is the class
@@ -1907,28 +1899,34 @@ iterations of the loop.
 
    The operand determines which intrinsic function is called:
 
-   +----------------------------------------+-----------------------------------+
-   | Operand                                | Description                       |
-   +========================================+===================================+
-   | ``INTRINSIC_2_INVALID``                | Not valid                         |
-   +----------------------------------------+-----------------------------------+
-   | ``INTRINSIC_PREP_RERAISE_STAR``        | Calculates the                    |
-   |                                        | :exc:`ExceptionGroup` to raise    |
-   |                                        | from a ``try-except*``.           |
-   +----------------------------------------+-----------------------------------+
-   | ``INTRINSIC_TYPEVAR_WITH_BOUND``       | Creates a :class:`typing.TypeVar` |
-   |                                        | with a bound.                     |
-   +----------------------------------------+-----------------------------------+
-   | ``INTRINSIC_TYPEVAR_WITH_CONSTRAINTS`` | Creates a                         |
-   |                                        | :class:`typing.TypeVar` with      |
-   |                                        | constraints.                      |
-   +----------------------------------------+-----------------------------------+
-   | ``INTRINSIC_SET_FUNCTION_TYPE_PARAMS`` | Sets the ``__type_params__``      |
-   |                                        | attribute of a function.          |
-   +----------------------------------------+-----------------------------------+
+   +----------------------------------------+-----------------------------------------+
+   | Operand                                | Description                             |
+   +========================================+=========================================+
+   | ``INTRINSIC_2_INVALID``                | Not valid                               |
+   +----------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_PREP_RERAISE_STAR``        | Calculates the                          |
+   |                                        | :exc:`ExceptionGroup` to raise          |
+   |                                        | from a ``try-except*``.                 |
+   +----------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_TYPEVAR_WITH_BOUND``       | Creates a :class:`typing.TypeVar`       |
+   |                                        | with a bound.                           |
+   +----------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_TYPEVAR_WITH_CONSTRAINTS`` | Creates a                               |
+   |                                        | :class:`typing.TypeVar` with            |
+   |                                        | constraints.                            |
+   +----------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_SET_FUNCTION_TYPE_PARAMS`` | Sets the ``__type_params__``            |
+   |                                        | attribute of a function.                |
+   +----------------------------------------+-----------------------------------------+
+   | ``INTRINSIC_MATCH_CLASS_ISINSTANCE``   | Do :func:`isinstance` checks for        |
+   |                                        | :ref:`Class patterns <class-patterns>`. |
+   +----------------------------------------+-----------------------------------------+
 
    .. versionadded:: 3.12
 
+   .. versionchanged:: 3.16
+      Added ``INTRINSIC_MATCH_CLASS_ISINSTANCE``.
+
 
 .. opcode:: LOAD_SPECIAL
 

Include/internal/pycore_intrinsics.h

@@ -30,8 +30,9 @@
 #define INTRINSIC_TYPEVAR_WITH_CONSTRAINTS       3
 #define INTRINSIC_SET_FUNCTION_TYPE_PARAMS       4
 #define INTRINSIC_SET_TYPEPARAM_DEFAULT          5
+#define INTRINSIC_MATCH_CLASS_ISINSTANCE         6
 
-#define MAX_INTRINSIC_2                          5
+#define MAX_INTRINSIC_2                          6
 
 typedef PyObject *(*intrinsic_func1)(PyThreadState* tstate, PyObject *value);
 typedef PyObject *(*intrinsic_func2)(PyThreadState* tstate, PyObject *value1, PyObject *value2);

Include/internal/pycore_magic_number.h

@@ -302,7 +302,6 @@ Known values:
     Python 3.16a1 3702 (Replace DELETE_NAME with PUSH_NULL; STORE_NAME)
     Python 3.16a1 3703 (Replace DELETE_GLOBAL with PUSH_NULL; STORE_GLOBAL)
     Python 3.16a1 3704 (Replace DELETE_ATTR with PUSH_NULL; STORE_ATTR)
-    Python 3.16a1 3705 (Add MATCH_CLASS_ISINSTANCE opcode)
 
 
     Python 3.17 will start with 3750
@@ -316,7 +315,7 @@ PC/launcher.c must also be updated.
 
 */
 
-#define PYC_MAGIC_NUMBER 3705
+#define PYC_MAGIC_NUMBER 3704
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
    (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \