fix linker

Author: BobTheBuidler

mypyc/lib-rt/CPy.h

@@ -74,10 +74,6 @@ static inline PyObject *CPyTuple_LoadEmptyTupleConstant(void) {
     return __mypyc_empty_tuple__;
 }
 
-// Shared unicode objects for method names
-extern PyObject *clear_id_unicode;
-extern PyObject *copy_id_unicode;
-
 // Native object operations
 
 

mypyc/lib-rt/dict_ops.c

@@ -15,7 +15,9 @@ static PyObject *update_id_unicode = NULL;
 static PyObject *keys_id_unicode = NULL;
 static PyObject *values_id_unicode = NULL;
 static PyObject *items_id_unicode = NULL;
-// clear_id_unicode and copy_id_unicode are shared with list_ops, declared in misc_ops.c
+// dict_ prefix prevents a name conflict with list_ops
+static PyObject *dict_copy_id_unicode = NULL;
+static PyObject *dict_clear_id_unicode = NULL;
 
 // Dict subclasses like defaultdict override things in interesting
 // ways, so we don't want to just directly use the dict methods. Not
@@ -336,14 +338,14 @@ char CPyDict_Clear(PyObject *dict) {
     if (PyDict_CheckExact(dict)) {
         PyDict_Clear(dict);
     } else {
-        if (clear_id_unicode == NULL) {
+        if (dict_clear_id_unicode == NULL) {
             _Py_IDENTIFIER(clear);
-            clear_id_unicode = _PyUnicode_FromId(&PyId_clear); /* borrowed */
-            if (clear_id_unicode == NULL) {
+            dict_clear_id_unicode = _PyUnicode_FromId(&PyId_clear); /* borrowed */
+            if (dict_clear_id_unicode == NULL) {
                 return 0;
             }
         }
-        PyObject *res = PyObject_CallMethodNoArgs(dict, clear_id_unicode);
+        PyObject *res = PyObject_CallMethodNoArgs(dict, dict_clear_id_unicode);
         if (res == NULL) {
             return 0;
         }
@@ -355,14 +357,14 @@ PyObject *CPyDict_Copy(PyObject *dict) {
     if (PyDict_CheckExact(dict)) {
         return PyDict_Copy(dict);
     }
-    if (copy_id_unicode == NULL) {
+    if (dict_copy_id_unicode == NULL) {
         _Py_IDENTIFIER(copy);
-        copy_id_unicode = _PyUnicode_FromId(&PyId_copy); /* borrowed */
-        if (copy_id_unicode == NULL) {
+        dict_copy_id_unicode = _PyUnicode_FromId(&PyId_copy); /* borrowed */
+        if (dict_copy_id_unicode == NULL) {
             return NULL;
         }
     }
-    return PyObject_CallMethodNoArgs(dict, copy_id_unicode);
+    return PyObject_CallMethodNoArgs(dict, dict_copy_id_unicode);
 }
 
 PyObject *CPyDict_GetKeysIter(PyObject *dict) {

mypyc/lib-rt/list_ops.c

@@ -9,7 +9,9 @@
 #define Py_TPFLAGS_SEQUENCE (1 << 5)
 #endif
 
-// clear_id_unicode and copy_id_unicode are shared with dict_ops, declared in misc_ops.c
+// list_ prefix prevents a name conflict with dict_ops
+static PyObject *list_clear_id_unicode = NULL;
+static PyObject *list_copy_id_unicode = NULL;
 
 PyObject *CPyList_Build(Py_ssize_t len, ...) {
     Py_ssize_t i;
@@ -35,14 +37,14 @@ char CPyList_Clear(PyObject *list) {
     if (PyList_CheckExact(list)) {
         PyList_Clear(list);
     } else {
-        if (clear_id_unicode == NULL) {
+        if (list_clear_id_unicode == NULL) {
             _Py_IDENTIFIER(clear);
-            clear_id_unicode = _PyUnicode_FromId(&PyId_clear);
-            if (clear_id_unicode == NULL) {
+            list_clear_id_unicode = _PyUnicode_FromId(&PyId_clear);
+            if (list_clear_id_unicode == NULL) {
                 return 0;
             }
         }
-        PyObject *res = PyObject_CallMethodNoArgs(list, clear_id_unicode);
+        PyObject *res = PyObject_CallMethodNoArgs(list, list_clear_id_unicode);
         if (res == NULL) {
             return 0;
         }
@@ -54,14 +56,14 @@ PyObject *CPyList_Copy(PyObject *list) {
     if(PyList_CheckExact(list)) {
         return PyList_GetSlice(list, 0, PyList_GET_SIZE(list));
     }
-    if (copy_id_unicode == NULL) {
+    if (list_copy_id_unicode == NULL) {
         _Py_IDENTIFIER(copy);
-        copy_id_unicode = _PyUnicode_FromId(&PyId_copy);
-        if (copy_id_unicode == NULL) {
+        list_copy_id_unicode = _PyUnicode_FromId(&PyId_copy);
+        if (list_copy_id_unicode == NULL) {
             return NULL;
         }
     }
-    return PyObject_CallMethodNoArgs(list, copy_id_unicode);
+    return PyObject_CallMethodNoArgs(list, list_copy_id_unicode);
 }
 
 PyObject *CPyList_GetItemShort(PyObject *list, CPyTagged index) {

mypyc/lib-rt/misc_ops.c

@@ -6,10 +6,6 @@
 #include <patchlevel.h>
 #include "CPy.h"
 
-PyObject *clear_id_unicode = NULL;
-PyObject *copy_id_unicode = NULL;
-static PyObject *send_id_unicode = NULL;
-
 PyObject *CPy_GetCoro(PyObject *obj)
 {
     // If the type has an __await__ method, call it,
@@ -24,6 +20,8 @@ PyObject *CPy_GetCoro(PyObject *obj)
     }
 }
 
+static PyObject *send_id_unicode = NULL;
+
 PyObject *CPyIter_Send(PyObject *iter, PyObject *val)
 {
     // Do a send, or a next if second arg is None.