remove current_filename optimization from marshal (#3423) (closes bpo-31384)
diff --git a/Python/marshal.c b/Python/marshal.c
index b6337e1..7b583ee 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -647,7 +647,6 @@
FILE *fp;
int depth;
PyObject *readable; /* Stream-like object being read from */
- PyObject *current_filename;
char *ptr;
char *end;
char *buf;
@@ -1390,18 +1389,6 @@
filename = r_object(p);
if (filename == NULL)
goto code_error;
- if (PyUnicode_CheckExact(filename)) {
- if (p->current_filename != NULL) {
- if (!PyUnicode_Compare(filename, p->current_filename)) {
- Py_DECREF(filename);
- Py_INCREF(p->current_filename);
- filename = p->current_filename;
- }
- }
- else {
- p->current_filename = filename;
- }
- }
name = r_object(p);
if (name == NULL)
goto code_error;
@@ -1484,7 +1471,6 @@
assert(fp);
rf.readable = NULL;
rf.fp = fp;
- rf.current_filename = NULL;
rf.end = rf.ptr = NULL;
rf.buf = NULL;
res = r_short(&rf);
@@ -1500,7 +1486,6 @@
long res;
rf.fp = fp;
rf.readable = NULL;
- rf.current_filename = NULL;
rf.ptr = rf.end = NULL;
rf.buf = NULL;
res = r_long(&rf);
@@ -1562,7 +1547,6 @@
PyObject *result;
rf.fp = fp;
rf.readable = NULL;
- rf.current_filename = NULL;
rf.depth = 0;
rf.ptr = rf.end = NULL;
rf.buf = NULL;
@@ -1583,7 +1567,6 @@
PyObject *result;
rf.fp = NULL;
rf.readable = NULL;
- rf.current_filename = NULL;
rf.ptr = (char *)str;
rf.end = (char *)str + len;
rf.buf = NULL;
@@ -1723,7 +1706,6 @@
rf.depth = 0;
rf.fp = NULL;
rf.readable = file;
- rf.current_filename = NULL;
rf.ptr = rf.end = NULL;
rf.buf = NULL;
if ((rf.refs = PyList_New(0)) != NULL) {
@@ -1782,7 +1764,6 @@
PyObject* result;
rf.fp = NULL;
rf.readable = NULL;
- rf.current_filename = NULL;
rf.ptr = s;
rf.end = s + n;
rf.depth = 0;