Eliminate redundant refcounting for LOAD_ATTR_MODULE

Author: aisk

Include/internal/pycore_moduleobject.h

@@ -13,6 +13,7 @@ extern "C" {
 
 extern void _PyModule_Clear(PyObject *);
 extern void _PyModule_ClearDict(PyObject *);
+extern void _PyModule_ExactDealloc(PyObject *);
 extern int _PyModuleSpec_IsInitializing(PyObject *);
 extern int _PyModuleSpec_GetFileOrigin(PyObject *, PyObject **);
 extern int _PyModule_IsPossiblyShadowing(PyObject *);

Objects/moduleobject.c

@@ -1126,6 +1126,13 @@ module_dealloc(PyObject *self)
     Py_TYPE(m)->tp_free((PyObject *)m);
 }
 
+void
+_PyModule_ExactDealloc(PyObject *self)
+{
+    assert(PyModule_CheckExact(self));
+    module_dealloc(self);
+}
+
 static PyObject *
 module_repr(PyObject *self)
 {

Python/bytecodes.c

@@ -371,6 +371,11 @@ dummy_func(
             PyStackRef_CLOSE_SPECIALIZED(value, _PyUnicode_ExactDealloc);
         }
 
+        op(_POP_TOP_MODULE, (value --)) {
+            assert(PyModule_CheckExact(PyStackRef_AsPyObjectBorrow(value)));
+            PyStackRef_CLOSE_SPECIALIZED(value, _PyModule_ExactDealloc);
+        }
+
         tier2 op(_POP_TWO, (nos, tos --)) {
             PyStackRef_CLOSE(tos);
             PyStackRef_CLOSE(nos);
@@ -2446,7 +2451,7 @@ dummy_func(
             unused/5 +
             _PUSH_NULL_CONDITIONAL;
 
-        op(_LOAD_ATTR_MODULE, (dict_version/2, index/1, owner -- attr)) {
+        op(_LOAD_ATTR_MODULE, (dict_version/2, index/1, owner -- attr, owner)) {
             PyObject *owner_o = PyStackRef_AsPyObjectBorrow(owner);
             DEOPT_IF(Py_TYPE(owner_o)->tp_getattro != PyModule_Type.tp_getattro);
             PyDictObject *dict = (PyDictObject *)((PyModuleObject *)owner_o)->md_dict;
@@ -2467,12 +2472,13 @@ dummy_func(
             attr = PyStackRef_FromPyObjectNew(attr_o);
             #endif
             STAT_INC(LOAD_ATTR, hit);
-            PyStackRef_CLOSE(owner);
+            DEAD(owner);
         }
 
         macro(LOAD_ATTR_MODULE) =
             unused/1 +
             _LOAD_ATTR_MODULE +
+            _POP_TOP_MODULE +
             unused/5 +
             _PUSH_NULL_CONDITIONAL;
 

Python/optimizer_bytecodes.c

@@ -637,6 +637,12 @@ dummy_func(void) {
         }
     }
 
+    op(_POP_TOP_MODULE, (value --)) {
+        if (PyJitRef_IsBorrowed(value)) {
+            REPLACE_OP(this_instr, _POP_TOP_NOP, 0, 0);
+        }
+    }
+
     op(_COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
         assert(oparg > 0);
         top = bottom;
@@ -655,7 +661,7 @@ dummy_func(void) {
         o = owner;
     }
 
-    op(_LOAD_ATTR_MODULE, (dict_version/2, index/1, owner -- attr)) {
+    op(_LOAD_ATTR_MODULE, (dict_version/2, index/1, owner -- attr, owner)) {
         (void)dict_version;
         (void)index;
         attr = PyJitRef_NULL;