commit 726fc139a5f40d81a0013c856be1283da08de4a0
author Serhiy Storchaka <storchaka@gmail.com> Sun Dec 27 15:44:33 2015 +0200
committer Serhiy Storchaka <storchaka@gmail.com> Sun Dec 27 15:44:33 2015 +0200
tree 7a7fe3b19e13842df5b5d45a8567fbfb5e7bbd75
parent bdb908ea5466bfa09869fd2e1e7f3b17fe0fb2ea
parent 191321d11bc7e064e1a07830a43fa600de310e1b

Issue #20440: More use of Py_SETREF.
This patch is manually crafted and contains changes that couldn't be handled
automatically.

Modules/_elementtree.c

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index f69ce29..f16d48f 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -965,9 +965,8 @@
         return NULL;
     }
 
-    Py_CLEAR(self->tag);
-    self->tag = tag;
-    Py_INCREF(self->tag);
+    Py_INCREF(tag);
+    Py_SETREF(self->tag, tag);
 
     _clear_joined_ptr(&self->text);
     self->text = text ? JOIN_SET(text, PyList_CheckExact(text)) : Py_None;
@@ -1010,9 +1009,8 @@
 
     /* Stash attrib. */
     if (attrib) {
-        Py_CLEAR(self->extra->attrib);
-        self->extra->attrib = attrib;
         Py_INCREF(attrib);
+        Py_SETREF(self->extra->attrib, attrib);
     }
 
     Py_RETURN_NONE;
@@ -1961,8 +1959,7 @@
 {
     _VALIDATE_ATTR_VALUE(value);
     Py_INCREF(value);
-    Py_DECREF(self->tag);
-    self->tag = value;
+    Py_SETREF(self->tag, value);
     return 0;
 }
 
@@ -1995,8 +1992,7 @@
             return -1;
     }
     Py_INCREF(value);
-    Py_DECREF(self->extra->attrib);
-    self->extra->attrib = value;
+    Py_SETREF(self->extra->attrib, value);
     return 0;
 }
 
@@ -2533,13 +2529,10 @@
     }
     self->index++;
 
-    Py_DECREF(this);
     Py_INCREF(node);
-    self->this = node;
-
-    Py_DECREF(self->last);
+    Py_SETREF(self->this, node);
     Py_INCREF(node);
-    self->last = node;
+    Py_SETREF(self->last, node);
 
     if (treebuilder_append_event(self, self->start_event_obj, node) < 0)
         goto error;
@@ -2612,15 +2605,12 @@
         return NULL;
     }
 
-    self->index--;
-
-    item = PyList_GET_ITEM(self->stack, self->index);
-    Py_INCREF(item);
-
-    Py_DECREF(self->last);
-
+    item = self->last;
     self->last = self->this;
-    self->this = item;
+    self->index--;
+    self->this = PyList_GET_ITEM(self->stack, self->index);
+    Py_INCREF(self->this);
+    Py_DECREF(item);
 
     if (treebuilder_append_event(self, self->end_event_obj, self->last) < 0)
         return NULL;