Add guard for code object when projecting traces through calls

Author: markshannon

Include/internal/pycore_uop_ids.h

@@ -4293,6 +4293,10 @@ dummy_func(
             DEOPT_IF(!((_PyExecutorObject *)executor)->vm_data.valid);
         }
 
+        tier2 op(_GUARD_CODE, (version/2 -- )) {
+            DEOPT_IF(((PyCodeObject *)frame->f_executable)->co_version != version);
+        }
+
         tier2 op(_FATAL_ERROR, (--)) {
             assert(0);
             Py_FatalError("Fatal error uop executed.");

Include/internal/pycore_uop_metadata.h

@@ -893,9 +893,13 @@ translate_bytecode_to_trace(
                                     operand = 0;
                                 }
                                 ADD_TO_TRACE(uop, oparg, operand, target);
+                                /* We need to guard that the runtime code object is
+                                 * the same one we are projecting into */
                                 code = new_code;
                                 func = new_func;
                                 instr = _PyCode_CODE(code);
+                                assert(code->co_version != 0);
+                                ADD_TO_TRACE(_GUARD_CODE, 0, code->co_version, 0);
                                 DPRINTF(2,
                                     "Continuing in %s (%s:%d) at byte offset %d\n",
                                     PyUnicode_AsUTF8(code->co_qualname),