Further work towards GCC 5 support

Author: davidmalcolm

gcc-python-tree.c

@@ -491,12 +491,9 @@ PyGccType_get_sizeof(struct PyGccTree *self, void *closure)
                                              0);
     PyObject *str;
 
-    /* Did TREE_INT_CST go away in 5.0? (wide-int?) */
-
     /* This gives us either an INTEGER_CST or the dummy error type: */
     if (INTEGER_CST == TREE_CODE(t_sizeof)) {
-        return PyGcc_int_from_double_int(TREE_INT_CST(t_sizeof),
-                                              1);
+        return PyGcc_int_from_int_cst (t_sizeof);
     }
 
     /* Error handling: */
@@ -668,23 +665,39 @@ PyGccConstructor_get_elements(PyObject *self, void *closure)
     return NULL;
 }
 
+PyObject *
+PyGcc_int_from_int_cst(tree int_cst)
+{
+    tree type = TREE_TYPE(int_cst);
+#if (GCC_VERSION >= 5000)
+    char buf[WIDE_INT_PRINT_BUFFER_SIZE];
+    print_dec(int_cst, buf, TYPE_SIGN (type));
+    return PyGcc_int_from_decimal_string_buffer(buf);
+#else
+    return PyGcc_int_from_double_int(TREE_INT_CST(int_cst),
+                                     TYPE_UNSIGNED(type));
+#endif
+}
+
 PyObject *
 PyGccIntegerConstant_get_constant(struct PyGccTree * self, void *closure)
 {
-    tree type = TREE_TYPE(self->t.inner);
-    return PyGcc_int_from_double_int(TREE_INT_CST(self->t.inner),
-                                          TYPE_UNSIGNED(type));
+    return PyGcc_int_from_int_cst(self->t.inner);
 }
 
 PyObject *
 PyGccIntegerConstant_repr(struct PyGccTree * self)
 {
     tree type = TREE_TYPE(self->t.inner);
+#if (GCC_VERSION >= 5000)
+    char buf[WIDE_INT_PRINT_BUFFER_SIZE];
+    print_dec(self->t.inner, buf, TYPE_SIGN (type));
+#else
     char buf[512];
-
     PyGcc_DoubleIntAsText(TREE_INT_CST(self->t.inner),
                                   TYPE_UNSIGNED(type),
                                   buf, sizeof(buf));
+#endif
     return PyGccString_FromFormat("%s(%s)",
                                          Py_TYPE(self)->tp_name,
                                          buf);

gcc-python.c

@@ -1,6 +1,6 @@
 /*
-   Copyright 2011, 2012, 2013 David Malcolm <dmalcolm@redhat.com>
-   Copyright 2011, 2012, 2013 Red Hat, Inc.
+   Copyright 2011-2013, 2015 David Malcolm <dmalcolm@redhat.com>
+   Copyright 2011-2013, 2015 Red Hat, Inc.
 
    This is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
@@ -854,6 +854,38 @@ PyGccStringOrNone(const char *str_or_null)
     }
 }
 
+PyObject *
+PyGcc_int_from_decimal_string_buffer(const char *buf)
+{
+    PyObject *long_obj;
+#if PY_MAJOR_VERSION < 3
+    long long_val;
+    int overflow;
+#endif
+    long_obj = PyLong_FromString((char *)buf, NULL, 10);
+    if (!long_obj) {
+        return NULL;
+    }
+#if PY_MAJOR_VERSION >= 3
+    return long_obj;
+#else
+    long_val = PyLong_AsLongAndOverflow(long_obj, &overflow);
+    if (overflow) {
+        /* Doesn't fit in a PyIntObject; use the PyLongObject: */
+        return long_obj;
+    } else {
+        /* Fits in a PyIntObject: use that */
+        PyObject *int_obj = PyInt_FromLong(long_val);
+        if (!int_obj) {
+            return long_obj;
+        }
+        Py_DECREF(long_obj);
+        return int_obj;
+    }
+#endif
+}
+
+#if (GCC_VERSION < 5000)
 /*
   "double_int" is declared in gcc/double-int.h as a pair of HOST_WIDE_INT.
   These in turn are defined in gcc/hwint.h as a #define to one of "long",
@@ -882,37 +914,13 @@ PyGcc_DoubleIntAsText(double_int di, bool is_unsigned,
 PyObject *
 PyGcc_int_from_double_int(double_int di, bool is_unsigned)
 {
-    PyObject *long_obj;
-#if PY_MAJOR_VERSION < 3
-    long long_val;
-    int overflow;
-#endif
     char buf[512]; /* FIXME */
     PyGcc_DoubleIntAsText(di, is_unsigned, buf, sizeof(buf));
-
-    long_obj = PyLong_FromString(buf, NULL, 10);
-    if (!long_obj) {
-        return NULL;
-    }
-#if PY_MAJOR_VERSION >= 3
-    return long_obj;
-#else
-    long_val = PyLong_AsLongAndOverflow(long_obj, &overflow);
-    if (overflow) {
-        /* Doesn't fit in a PyIntObject; use the PyLongObject: */
-        return long_obj;
-    } else {
-        /* Fits in a PyIntObject: use that */
-        PyObject *int_obj = PyInt_FromLong(long_val);
-        if (!int_obj) {
-            return long_obj;
-        }
-        Py_DECREF(long_obj);
-        return int_obj;
-    }
-#endif
+    return PyGcc_int_from_decimal_string_buffer(buf);
 }
 
+#endif /* #if (GCC_VERSION < 5000) */
+
 /*
    GCC's headers "poison" strdup to make it unavailable, so we provide our own.
 

gcc-python.h

@@ -317,6 +317,9 @@ PyObject *
 VEC_tree_as_PyList(VEC(tree,gc) *vec_nodes);
 #endif
 
+PyObject *
+PyGcc_int_from_int_cst(tree int_cst);
+
 PyObject *
 PyGcc_int_from_decimal_string_buffer(const char *buf);