[Python-checkins] bpo-40898: Remove redundant if statements in tp_traverse (GH-20692)

Sun Jun 7 08:06:01 EDT 2020

https://github.com/python/cpython/commit/47a23fc63fa5df2da8dbc542e78e521d4a7f10c9
commit: 47a23fc63fa5df2da8dbc542e78e521d4a7f10c9
branch: master
author: Hai Shi <shihai1992 at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020年06月07日T21:05:36+09:00
summary:
bpo-40898: Remove redundant if statements in tp_traverse (GH-20692)
files:
M Modules/_functoolsmodule.c
M Modules/_io/_iomodule.c
M Modules/itertoolsmodule.c
M Modules/overlapped.c

diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
index d158d3bae157b..f1ee23f294fa3 100644
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -484,8 +484,7 @@ static int
 keyobject_traverse(keyobject *ko, visitproc visit, void *arg)
 {
 Py_VISIT(ko->cmp);
- if (ko->object)
- Py_VISIT(ko->object);
+ Py_VISIT(ko->object);
 return 0;
 }
 
diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c
index a55e5cad6a392..e430352a48e21 100644
--- a/Modules/_io/_iomodule.c
+++ b/Modules/_io/_iomodule.c
@@ -623,9 +623,7 @@ iomodule_traverse(PyObject *mod, visitproc visit, void *arg) {
 _PyIO_State *state = get_io_state(mod);
 if (!state->initialized)
 return 0;
- if (state->locale_module != NULL) {
- Py_VISIT(state->locale_module);
- }
+ Py_VISIT(state->locale_module);
 Py_VISIT(state->unsupported_operation);
 return 0;
 }
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
index 18fcebdf25b46..3f2f7165b171b 100644
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -999,8 +999,7 @@ cycle_dealloc(cycleobject *lz)
 static int
 cycle_traverse(cycleobject *lz, visitproc visit, void *arg)
 {
- if (lz->it)
- Py_VISIT(lz->it);
+ Py_VISIT(lz->it);
 Py_VISIT(lz->saved);
 return 0;
 }
diff --git a/Modules/overlapped.c b/Modules/overlapped.c
index df6282cba819b..eed8fbf039300 100644
--- a/Modules/overlapped.c
+++ b/Modules/overlapped.c
@@ -1504,12 +1504,8 @@ Overlapped_traverse(OverlappedObject *self, visitproc visit, void *arg)
 }
 break;
 case TYPE_READ_FROM:
- if(self->read_from.result) {
- Py_VISIT(self->read_from.result);
- }
- if(self->read_from.allocated_buffer) {
- Py_VISIT(self->read_from.allocated_buffer);
- }
+ Py_VISIT(self->read_from.result);
+ Py_VISIT(self->read_from.allocated_buffer);
 }
 return 0;
 }
