Don't use PyInt on Python 3

[cbiesinger]

Summary

In Python 3, PyInt doesn't exist (all integers are PyLongs). This patch
makes LLVM not use PyInt when compiling for Python 3. (Some code already
had such #ifs)

[cbiesinger]

It seems this wasn't necessary, I had just misconfigured my build. (I don't understand how this works though...)

[cbiesinger]

Ah, this works because Swig (?) adds compatibility macros to LLDBWrapPython:
#define PyInt_Check(x) PyLong_Check(x)
#define PyInt_AsLong(x) PyLong_AsLong(x)
#define PyInt_FromLong(x) PyLong_FromLong(x)
#define PyInt_FromSize_t(x) PyLong_FromSize_t(x)
(etc)

[clayborg]

ok, so do you want to abandon this patch?

[cbiesinger]

Yeah. (I thought I did? I'm not super familiar with this interface)

[clayborg]

never mind, I missed that you had!

lldb/scripts/Python/python-swigsafecast.swig

 }
 
 template <>
 PyObject*
 SBTypeToSWIGWrapper (unsigned int* c_int)
 {
     if (!c_int)
         return NULL;
+#if PY_MAJOR_VERSION < 3
     return PyInt_FromLong(*c_int);
+#else
+    return PyLong_FromLong(*c_int);
+#endif
 }
 
 template <>
 PyObject*
 SBTypeToSWIGWrapper (lldb::SBEvent* event_sb)
 {
     return SWIG_NewPointerObj((void *) event_sb, SWIGTYPE_p_lldb__SBEvent, 0);
 }

lldb/scripts/Python/python-typemaps.swig

%typemap(in) lldb::StateType {
   }
 }
 
 /* Typemap definitions to allow SWIG to properly handle char buffer. */
 
 // typemap for a char buffer
 // See also SBThread::GetStopDescription.
 %typemap(in) (char *dst, size_t dst_len) {
+   // In Python 3, all integers are PyLongs
+#if PY_MAJOR_VERSION < 3
    if (!PyInt_Check($input)) {
+#else
+   if (!PyLong_Check($input)) {
+#endif
        PyErr_SetString(PyExc_ValueError, "Expecting an integer");
        return NULL;
    }
+#if PY_MAJOR_VERSION < 3
    $2 = PyInt_AsLong($input);
+#else
+   $2 = PyLong_AsLong($input);
+#endif
    if ($2 <= 0) {
        PyErr_SetString(PyExc_ValueError, "Positive integer expected");
        return NULL;
    }
    $1 = (char *) malloc($2);
 }
 // SBProcess::ReadCStringFromMemory() uses a void*, but needs to be treated
 // as char data instead of byte data.
else {
       PyErr_SetString(PyExc_ValueError, "Expecting a buffer");
       return NULL;
    }
 }
 
 // typemap for an incoming buffer
 // See also SBProcess::ReadMemory.
 %typemap(in) (void *buf, size_t size) {
+   // In Python 3, all integers are PyLongs, so the PyInt code is only needed
+   // on Python 2.
+#if PY_MAJOR_VERSION < 3
    if (PyInt_Check($input)) {
       $2 = PyInt_AsLong($input);
-   } else if (PyLong_Check($input)) {
+   } else
+#endif
+   if (PyLong_Check($input)) {
       $2 = PyLong_AsLong($input);
    } else {
       PyErr_SetString(PyExc_ValueError, "Expecting an integer or long object");
       return NULL;
    }
    if ($2 <= 0) {
        PyErr_SetString(PyExc_ValueError, "Positive integer expected");
        return NULL;

 }
 
 template <> int32_t PyLongAsT<int32_t>(PyObject *obj) {
   return static_cast<int32_t>(PyLong_AsLong(obj));
 }
 
 template <class T>
 bool SetNumberFromPyObject(T &number, PyObject *obj) {
+   // In Python 3, all integers are PyLongs, so the PyInt code is only needed
+   // on Python 2.
+#if PY_MAJOR_VERSION < 3
   if (PyInt_Check(obj))
     number = static_cast<T>(PyInt_AsLong(obj));
-  else if (PyLong_Check(obj))
+  else
+#endif
+  if (PyLong_Check(obj))
     number = PyLongAsT<T>(obj);
   else return false;
 
   return true;
 }
 
 template <>
 bool SetNumberFromPyObject<double>(double &number, PyObject *obj) {

 
 %typemap(argout) (uint32_t *versions, uint32_t num_versions) {
     uint32_t count = result;
     if (count >= $2)
         count = $2;
     PyObject* list = PyList_New(count);
     for (uint32_t j = 0; j < count; j++)
     {
+#if PY_MAJOR_VERSION < 3
         PyObject* item = PyInt_FromLong($1[j]);
+#else
+        PyObject* item = PyLong_FromLong($1[j]);
+#endif
         int ok = PyList_SetItem(list,j,item);
         if (ok != 0)
         {
             $result = Py_None;
             break;
         }
     }
     $result = list;

lldb/tools/intel-features/scripts/python-typemaps.txt

 /* Typemap definitions to allow SWIG to properly handle some data types */
 
 // typemap for an incoming buffer
 %typemap(in) (void *buf, size_t size) {
+#if PY_MAJOR_VERSION < 3
    if (PyInt_Check($input)) {
       $2 = PyInt_AsLong($input);
-   } else if (PyLong_Check($input)) {
+   } else
+#endif
+   if (PyLong_Check($input)) {
       $2 = PyLong_AsLong($input);
    } else {
       PyErr_SetString(PyExc_ValueError, "Expecting an integer or long object");
       return NULL;
    }
    if ($2 <= 0) {
        PyErr_SetString(PyExc_ValueError, "Positive integer expected");
        return NULL;