@@ -30,6 +30,10 @@ PyAPI_FUNC(int) _PyDict_SetItem_KnownHash(PyObject *mp, PyObject *key,
 // Export for '_asyncio' shared extension
 PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key,
                                           Py_hash_t hash);
+
+extern int _PyDict_DelItem_KnownHash_LockHeld(PyObject *mp, PyObject *key,
+                                              Py_hash_t hash);
+
 extern int _PyDict_Contains_KnownHash(PyObject *, PyObject *, Py_hash_t);
 
 // "Id" variants
@@ -47,6 +51,8 @@ extern int _PyDict_HasOnlyStringKeys(PyObject *mp);
 // Export for '_ctypes' shared extension
 PyAPI_FUNC(Py_ssize_t) _PyDict_SizeOf(PyDictObject *);
 
+extern Py_ssize_t _PyDict_SizeOf_LockHeld(PyDictObject *);
+
 #define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL)
 
 /* Like PyDict_Merge, but override can be 0, 1 or 2.  If override is 0,
 
@@ -0,0 +1 @@
+Fix thread safety of :class:`collections.OrderedDict`. Patch by Kumar Aditya.
@@ -2819,8 +2819,8 @@ PyDict_DelItem(PyObject *op, PyObject *key)
     return _PyDict_DelItem_KnownHash(op, key, hash);
 }
 
-static int
-delitem_knownhash_lock_held(PyObject *op, PyObject *key, Py_hash_t hash)
+int
+_PyDict_DelItem_KnownHash_LockHeld(PyObject *op, PyObject *key, Py_hash_t hash)
 {
     Py_ssize_t ix;
     PyDictObject *mp;
@@ -2855,7 +2855,7 @@ _PyDict_DelItem_KnownHash(PyObject *op, PyObject *key, Py_hash_t hash)
 {
     int res;
     Py_BEGIN_CRITICAL_SECTION(op);
-    res = delitem_knownhash_lock_held(op, key, hash);
+    res = _PyDict_DelItem_KnownHash_LockHeld(op, key, hash);
     Py_END_CRITICAL_SECTION();
     return res;
 }
@@ -4703,9 +4703,11 @@ dict_tp_clear(PyObject *op)
 
 static PyObject *dictiter_new(PyDictObject *, PyTypeObject *);
 
-static Py_ssize_t
-sizeof_lock_held(PyDictObject *mp)
+Py_ssize_t
+_PyDict_SizeOf_LockHeld(PyDictObject *mp)
 {
+    _Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);
+
     size_t res = _PyObject_SIZE(Py_TYPE(mp));
     if (_PyDict_HasSplitTable(mp)) {
         res += shared_keys_usable_size(mp->ma_keys) * sizeof(PyObject*);
@@ -4724,7 +4726,7 @@ _PyDict_SizeOf(PyDictObject *mp)
 {
     Py_ssize_t res;
     Py_BEGIN_CRITICAL_SECTION(mp);
-    res = sizeof_lock_held(mp);
+    res = _PyDict_SizeOf_LockHeld(mp);
     Py_END_CRITICAL_SECTION();
 
     return res;
@@ -6909,7 +6911,7 @@ _PyDict_SetItem_LockHeld(PyDictObject *dict, PyObject *name, PyObject *value)
             dict_unhashable_type(name);
             return -1;
         }
-        return delitem_knownhash_lock_held((PyObject *)dict, name, hash);
+        return _PyDict_DelItem_KnownHash_LockHeld((PyObject *)dict, name, hash);
     } else {
         return setitem_lock_held(dict, name, value);
     }
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix thread safety of :class:`collections.OrderedDict`. Patch by Kumar Aditya.
Original file line number	Diff line number	Diff line change
`@@ -2819,8 +2819,8 @@ PyDict_DelItem(PyObject op, PyObject key)`
`2819`	`2819`	`return _PyDict_DelItem_KnownHash(op, key, hash);`
`2820`	`2820`	`}`
`2821`	`2821`
`2822`		`-static int`
`2823`		`-delitem_knownhash_lock_held(PyObject op, PyObject key, Py_hash_t hash)`
	`2822`	`+int`
	`2823`	`+_PyDict_DelItem_KnownHash_LockHeld(PyObject op, PyObject key, Py_hash_t hash)`
`2824`	`2824`	`{`
`2825`	`2825`	`Py_ssize_t ix;`
`2826`	`2826`	`PyDictObject *mp;`
`@@ -2855,7 +2855,7 @@ _PyDict_DelItem_KnownHash(PyObject op, PyObject key, Py_hash_t hash)`
`2855`	`2855`	`{`
`2856`	`2856`	`int res;`
`2857`	`2857`	`Py_BEGIN_CRITICAL_SECTION(op);`
`2858`		`- res = delitem_knownhash_lock_held(op, key, hash);`
	`2858`	`+ res = _PyDict_DelItem_KnownHash_LockHeld(op, key, hash);`
`2859`	`2859`	`Py_END_CRITICAL_SECTION();`
`2860`	`2860`	`return res;`
`2861`	`2861`	`}`
`@@ -4703,9 +4703,11 @@ dict_tp_clear(PyObject *op)`
`4703`	`4703`
`4704`	`4704`	`static PyObject dictiter_new(PyDictObject , PyTypeObject *);`
`4705`	`4705`
`4706`		`-static Py_ssize_t`
`4707`		`-sizeof_lock_held(PyDictObject *mp)`
	`4706`	`+Py_ssize_t`
	`4707`	`+_PyDict_SizeOf_LockHeld(PyDictObject *mp)`
`4708`	`4708`	`{`
	`4709`	`+ _Py_CRITICAL_SECTION_ASSERT_OBJECT_LOCKED(mp);`
	`4710`	`+`
`4709`	`4711`	`size_t res = _PyObject_SIZE(Py_TYPE(mp));`
`4710`	`4712`	`if (_PyDict_HasSplitTable(mp)) {`
`4711`	`4713`	`res += shared_keys_usable_size(mp->ma_keys) * sizeof(PyObject*);`
`@@ -4724,7 +4726,7 @@ _PyDict_SizeOf(PyDictObject *mp)`
`4724`	`4726`	`{`
`4725`	`4727`	`Py_ssize_t res;`
`4726`	`4728`	`Py_BEGIN_CRITICAL_SECTION(mp);`
`4727`		`- res = sizeof_lock_held(mp);`
	`4729`	`+ res = _PyDict_SizeOf_LockHeld(mp);`
`4728`	`4730`	`Py_END_CRITICAL_SECTION();`
`4729`	`4731`
`4730`	`4732`	`return res;`
`@@ -6909,7 +6911,7 @@ _PyDict_SetItem_LockHeld(PyDictObject dict, PyObject name, PyObject *value)`
`6909`	`6911`	`dict_unhashable_type(name);`
`6910`	`6912`	`return -1;`
`6911`	`6913`	`}`
`6912`		`- return delitem_knownhash_lock_held((PyObject *)dict, name, hash);`
	`6914`	`+ return _PyDict_DelItem_KnownHash_LockHeld((PyObject *)dict, name, hash);`
`6913`	`6915`	`} else {`
`6914`	`6916`	`return setitem_lock_held(dict, name, value);`
`6915`	`6917`	`}`