Successfully compiles, but crashes

Author: brandtbucher

Include/internal/pycore_opcode_metadata.h

@@ -1139,8 +1139,8 @@ def func2():
             ('call', 'func2', sys.monitoring.MISSING),
             ('line', 'func2', 1),
             ('line', 'func2', 2),
-            ('call', 'append', [2]),
-            ('C return', 'append', [2]),
+            ('call', 'append', 2),
+            ('C return', 'append', 2),
             ('line', 'func2', 3),
             ('line', 'get_events', 11),
             ('call', 'set_events', 2)])
@@ -1435,8 +1435,8 @@ def func2():
         self.check_events(func2, recorders = LOCAL_RECORDERS, expected = [
             ('line', 'func2', 1),
             ('line', 'func2', 2),
-            ('call', 'append', [2]),
-            ('C return', 'append', [2]),
+            ('call', 'append', 2),
+            ('C return', 'append', 2),
             ('line', 'func2', 3)])
 
     def test_try_except(self):
@@ -1914,7 +1914,6 @@ def f():
         """)
 
         def get_expected(name, call_method, ns):
-            repr_arg = 0 if name == "int" else sys.monitoring.MISSING
             return [
                 ('line', 'get_events', 10),
                 ('call', 'f', sys.monitoring.MISSING),
@@ -1925,8 +1924,8 @@ def get_expected(name, call_method, ns):
                 ('C return', name, sys.monitoring.MISSING),
                 *(
                     [
-                        ('call', '__repr__', repr_arg),
-                        ('C return', '__repr__', repr_arg),
+                        ('call', '__repr__', sys.monitoring.MISSING),
+                        ('C return', '__repr__', sys.monitoring.MISSING),
                     ] if call_method else []
                 ),
                 ('line', 'get_events', 11),

Lib/test/test_monitoring.py

@@ -105,6 +105,7 @@
       <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_BUILD_CORE_BUILTIN;Py_ENABLE_SHARED;MS_DLL_ID="$(SysWinVer)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="$(IncludeExternals)">_Py_HAVE_ZLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions Condition="'$(UseTailCalls)' == 'true'">/std:clatest %(AdditionalOptions)</AdditionalOptions>
+      <!-- <AdditionalOptions Condition="'$(UseTailCalls)' == 'true'">/d2DisableTailCallError %(AdditionalOptions)</AdditionalOptions> -->
       <PreprocessorDefinitions Condition="'$(UseTailCalls)' == 'true'">Py_TAIL_CALL_INTERP=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(UseJIT)' == 'true'">_Py_JIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(UseTIER2)' != '' and '$(UseTIER2)' != '0'">_Py_TIER2=$(UseTIER2);%(PreprocessorDefinitions)</PreprocessorDefinitions>

PCbuild/pythoncore.vcxproj

@@ -2113,19 +2113,12 @@ dummy_func(
             STAT_INC(LOAD_SUPER_ATTR, hit);
             PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 2);
             PyTypeObject *cls = (PyTypeObject *)class;
-            int method_found = 0;
-            PyObject *attr_o = _PySuper_Lookup(cls, self, name,
-                                   Py_TYPE(self)->tp_getattro == PyObject_GenericGetAttr ? &method_found : NULL);
+            PyObject *attr_o = _PySuper_Lookup(cls, self, name, NULL);
             if (attr_o == NULL) {
                 ERROR_NO_POP();
             }
-            if (method_found) {
-                self_or_null = self_st; // transfer ownership
-                DEAD(self_st);
-            } else {
-                PyStackRef_CLOSE(self_st);
-                self_or_null = PyStackRef_NULL;
-            }
+            PyStackRef_CLOSE(self_st);
+            self_or_null = PyStackRef_NULL;
             DECREF_INPUTS();
 
             attr = PyStackRef_FromPyObjectSteal(attr_o);
@@ -2160,39 +2153,13 @@ dummy_func(
             #endif  /* ENABLE_SPECIALIZATION_FT */
         }
 
-        op(_LOAD_ATTR, (owner -- attr, self_or_null[oparg&1])) {
+        op(_LOAD_ATTR, (owner -- attr, self_or_null[oparg & 1])) {
             PyObject *name = GETITEM(FRAME_CO_NAMES, oparg >> 1);
-            PyObject *attr_o;
+            PyObject *attr_o = PyObject_GetAttr(PyStackRef_AsPyObjectBorrow(owner), name);
+            PyStackRef_CLOSE(owner);
+            ERROR_IF(attr_o == NULL, error);
             if (oparg & 1) {
-                /* Designed to work in tandem with CALL, pushes two values. */
-                attr_o = NULL;
-                int is_meth = _PyObject_GetMethod(PyStackRef_AsPyObjectBorrow(owner), name, &attr_o);
-                if (is_meth) {
-                    /* We can bypass temporary bound method object.
-                       meth is unbound method and obj is self.
-                       meth | self | arg1 | ... | argN
-                     */
-                    assert(attr_o != NULL);  // No errors on this branch
-                    self_or_null[0] = owner;  // Transfer ownership
-                    DEAD(owner);
-                }
-                else {
-                    /* meth is not an unbound method (but a regular attr, or
-                       something was returned by a descriptor protocol).  Set
-                       the second element of the stack to NULL, to signal
-                       CALL that it's not a method call.
-                       meth | NULL | arg1 | ... | argN
-                    */
-                    PyStackRef_CLOSE(owner);
-                    ERROR_IF(attr_o == NULL, error);
-                    self_or_null[0] = PyStackRef_NULL;
-                }
-            }
-            else {
-                /* Classic, pushes one value. */
-                attr_o = PyObject_GetAttr(PyStackRef_AsPyObjectBorrow(owner), name);
-                PyStackRef_CLOSE(owner);
-                ERROR_IF(attr_o == NULL, error);
+                self_or_null[0] = PyStackRef_NULL;
             }
             attr = PyStackRef_FromPyObjectSteal(attr_o);
         }

Python/bytecodes.c

@@ -98,7 +98,7 @@
         do { \
             Py_MUSTTAIL return (_TAIL_CALL_##name)(frame, stack_pointer, tstate, this_instr, oparg); \
         } while (0)
-#    define LABEL(name) TARGET(name)
+#    define LABEL(name) Py_NO_INLINE TARGET(name)
 #elif USE_COMPUTED_GOTOS
 #  define TARGET(op) TARGET_##op:
 #  define DISPATCH_GOTO() goto *opcode_targets[opcode]

Python/ceval_macros.h

@@ -1221,7 +1221,7 @@ _Py_call_instrumentation_2args(
     return call_instrumentation_vector(instr, tstate, event, frame, instr, 4, args);
 }
 
-_Py_CODEUNIT *
+Py_NO_INLINE _Py_CODEUNIT *
 _Py_call_instrumentation_jump(
     _Py_CODEUNIT *instr, PyThreadState *tstate, int event,
     _PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNIT *dest)