Double check that keys are still valid

mpage · Nov 8, 2024 · 49ec70a · 49ec70a
1 parent 8f6239d
commit 49ec70a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 deletions.
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
@@ -1633,6 +1633,11 @@ dummy_func(
             #if Py_GIL_DISABLED
             int increfed = _Py_TryIncrefCompare(&entries[index].me_value, res_o);
             DEOPT_IF(!increfed);
+            PyDictObject *dict = (PyDictObject*) GLOBALS();
+            if (globals_keys != _Py_atomic_load_ptr_acquire(&dict->ma_keys)) {
+                Py_DECREF(res_o);
+                DEOPT_IF(true);
+            }
             #else
             Py_INCREF(res_o);
             #endif
@@ -1650,6 +1655,11 @@ dummy_func(
             #if Py_GIL_DISABLED
             int increfed = _Py_TryIncrefCompare(&entries[index].me_value, res_o);
             DEOPT_IF(!increfed);
+            PyDictObject *dict = (PyDictObject*) BUILTINS();
+            if (builtins_keys != _Py_atomic_load_ptr_acquire(&dict->ma_keys)) {
+                Py_DECREF(res_o);
+                DEOPT_IF(true);
+            }
             #else
             Py_INCREF(res_o);
             #endif

diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/generated_cases.c.h b/Python/generated_cases.c.h
diff --git a/Tools/cases_generator/analyzer.py b/Tools/cases_generator/analyzer.py
@@ -623,6 +623,7 @@ def has_error_without_pop(op: parser.InstDef) -> bool:
     "_Py_NewRef",
     "_Py_SINGLETON",
     "_Py_STR",
+    "_Py_atomic_load_ptr_acquire",
     "_Py_atomic_load_uintptr_relaxed",
     "_Py_set_eval_breaker_bit",
     "advance_backoff_counter",