Merge pull request #114 from davidmalcolm/fixing-before-gcc-7

Fix build problems with gcc < 7

Author: davidmalcolm

gcc-c-api/gcc-location.c

@@ -62,6 +62,14 @@ GCC_IMPLEMENT_PUBLIC_API (bool) gcc_location_get_in_system_header (gcc_location
   return in_system_header_at (loc.inner);
 }
 
+/* get_pure_location and get_finish were added to gcc's input.h in
+   gcc's r238792 (aka f17776ffcba650feb512137e3e22a04f3f433c84).
+   get_start was added to gcc's input.h in gcc's r239831
+   (aka aca2a315073c72fb7c9ab1be779c290cc91f564c).
+   I believe that makes them available in gcc 7 onwards.  */
+
+#if (GCC_VERSION >= 7000)
+
 GCC_IMPLEMENT_PUBLIC_API (gcc_location)
 gcc_location_get_caret (gcc_location loc)
 {
@@ -80,6 +88,14 @@ gcc_location_get_finish (gcc_location loc)
   return gcc_private_make_location (get_finish (loc.inner));
 }
 
+#endif
+
+/* linemap_position_for_loc_and_offset was added in gcc's r217383
+   (aka 766928aa6ac2c846c2d098ef4ef9e220feb4dcab).
+   It's present in gcc 5.1. */
+
+#if (GCC_VERSION >= 5000)
+
 GCC_IMPLEMENT_PUBLIC_API(gcc_location)
 gcc_location_offset_column (gcc_location loc, int offset)
 {
@@ -88,6 +104,8 @@ gcc_location_offset_column (gcc_location loc, int offset)
                                           offset));
 }
 
+#endif
+
 GCC_IMPLEMENT_PUBLIC_API (void) gcc_set_input_location (gcc_location loc)
 {
   input_location = loc.inner;

gcc-python-diagnostics.c

@@ -144,11 +144,12 @@ PyGcc_warning(PyObject *self, PyObject *args, PyObject *kwargs)
 PyObject *
 PyGcc_inform(PyObject *self, PyObject *args, PyObject *kwargs)
 {
-    PyObject *obj;
     const char *msg;
     const char *keywords[] = {"location",
                               "message",
                               NULL};
+#if (GCC_VERSION >= 6000)
+    PyObject *obj;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
                                      "Os:inform", (char**)keywords,
@@ -170,6 +171,20 @@ PyGcc_inform(PyObject *self, PyObject *args, PyObject *kwargs)
                             ("type of location must be either gcc.Location"
                              " or gcc.RichLocation"));
     }
+#else
+    PyGccLocation *loc_obj;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+                                     "O!s:inform", (char**)keywords,
+                                     &PyGccLocation_TypeObj, &loc_obj,
+                                     &msg)) {
+        return NULL;
+    }
+
+    gcc_inform(loc_obj->loc, msg);
+
+    Py_RETURN_NONE;
+#endif
 }
 
 /*

gcc-python-location.c

@@ -33,6 +33,8 @@
           typedef unsigned int source_location;
 */
 
+#if (GCC_VERSION >= 7000)
+
 int
 PyGccLocation_init(PyGccLocation *self, PyObject *args, PyObject *kwargs)
 {
@@ -58,6 +60,8 @@ PyGccLocation_init(PyGccLocation *self, PyObject *args, PyObject *kwargs)
     return 0;
 }
 
+#endif
+
 PyObject *
 PyGccLocation_repr(struct PyGccLocation * self)
 {
@@ -189,6 +193,8 @@ PyGccLocation_hash(struct PyGccLocation * self)
     return self->loc.inner;
 }
 
+#if (GCC_VERSION >= 5000)
+
 PyObject *
 PyGccLocation_offset_column(PyGccLocation *self, PyObject *args)
 {
@@ -201,6 +207,8 @@ PyGccLocation_offset_column(PyGccLocation *self, PyObject *args)
     return PyGccLocation_New(gcc_location_offset_column(self->loc, offset));
 }
 
+#endif /* #if (GCC_VERSION >= 5000) */
+
 PyObject *
 PyGccLocation_New(gcc_location loc)
 {
@@ -230,8 +238,11 @@ PyGcc_WrtpMarkForPyGccLocation(PyGccLocation *wrapper)
     /* empty */
 }
 
+
 /* rich_location. */
 
+#if (GCC_VERSION >= 6000)
+
 PyObject *
 PyGccRichLocation_add_fixit_replace(PyGccRichLocation *self, PyObject *args,
                                     PyObject *kwargs)
@@ -246,7 +257,9 @@ PyGccRichLocation_add_fixit_replace(PyGccRichLocation *self, PyObject *args,
         return NULL;
     }
 
-    self->richloc.add_fixit_replace (new_content);
+    self->richloc.add_fixit_replace (get_range_from_loc (line_table,
+                                                         self->richloc.get_loc (0)),
+                                     new_content);
 
     Py_RETURN_NONE;
 }
@@ -275,6 +288,8 @@ PyGcc_WrtpMarkForPyGccRichLocation(PyGccRichLocation *wrapper)
     /* empty */
 }
 
+#endif /* #if (GCC_VERSION >= 6000) */
+
 /*
   PEP-7  
 Local variables:

gcc-python-wrappers.h

@@ -150,6 +150,8 @@ PyGccLocation_hash(struct PyGccLocation * self);
 PyObject *
 PyGccLocation_offset_column(PyGccLocation *self, PyObject *args);
 
+#if (GCC_VERSION >= 6000)
+
 PyObject *
 PyGccRichLocation_add_fixit_replace(PyGccRichLocation *self, PyObject *args,
                                     PyObject *kwargs);
@@ -158,6 +160,8 @@ int
 PyGccRichLocation_init(PyGccRichLocation *self, PyObject *args,
                        PyObject *kwargs);
 
+#endif
+
 /* gcc-python-cfg.c: */
 PyObject *
 PyGccBasicBlock_repr(struct PyGccBasicBlock * self);

gcc-python.h

@@ -185,11 +185,17 @@ DECLARE_SIMPLE_WRAPPER(PyGccLocation,
 		       location,
 		       gcc_location, loc)
 
+/* class rich_location was added to libcpp in gcc 6.  */
+
+#if (GCC_VERSION >= 6000)
+
 DECLARE_SIMPLE_WRAPPER(PyGccRichLocation,
 		       PyGccRichLocation_TypeObj,
 		       rich_location,
 		       rich_location, richloc)
 
+#endif
+
 DECLARE_SIMPLE_WRAPPER(PyGccGimple, 
 		       PyGccGimple_TypeObj,
 		       gimple,

generate-location-c.py

@@ -16,6 +16,7 @@
 #   <http://www.gnu.org/licenses/>.
 
 from cpybuilder import *
+from testcpychecker import get_gcc_version
 from wrapperbuilder import PyGccWrapperTypeObject
 
 cu = CompilationUnit()
@@ -61,24 +62,22 @@ def generate_location():
     return PyGccInt_FromLong(gcc_location_get_column(self->loc));
 }
 """)
-
-    cu.add_defn("""
+    if get_gcc_version() >= 7000:
+        cu.add_defn("""
 static PyObject *
 PyGccLocation_get_caret(struct PyGccLocation *self, void *closure)
 {
     return PyGccLocation_New(gcc_location_get_caret(self->loc));
 }
 """)
-
-    cu.add_defn("""
+        cu.add_defn("""
 static PyObject *
 PyGccLocation_get_start(struct PyGccLocation *self, void *closure)
 {
     return PyGccLocation_New(gcc_location_get_start(self->loc));
 }
 """)
-
-    cu.add_defn("""
+        cu.add_defn("""
 static PyObject *
 PyGccLocation_get_finish(struct PyGccLocation *self, void *closure)
 {
@@ -90,31 +89,33 @@ def generate_location():
                                    [PyGetSetDef('file', 'PyGccLocation_get_file', None, 'Name of the source file'),
                                     PyGetSetDef('line', 'PyGccLocation_get_line', None, 'Line number within source file'),
                                     PyGetSetDef('column', 'PyGccLocation_get_column', None, 'Column number within source file'),
-                                    PyGetSetDef('caret', 'PyGccLocation_get_caret', None, 'Location of caret'),
-                                    PyGetSetDef('start', 'PyGccLocation_get_start', None, 'Starting location of range'),
-                                    PyGetSetDef('finish', 'PyGccLocation_get_finish', None, 'End location of range'),
                                     ],
                                    identifier_prefix='PyGccLocation',
                                    typename='PyGccLocation')
+    if get_gcc_version() >= 7000:
+        getsettable.gsdefs += [PyGetSetDef('caret', 'PyGccLocation_get_caret', None, 'Location of caret'),
+                               PyGetSetDef('start', 'PyGccLocation_get_start', None, 'Starting location of range'),
+                               PyGetSetDef('finish', 'PyGccLocation_get_finish', None, 'End location of range')]
     getsettable.add_simple_getter(cu,
                                   'in_system_header',
                                   'PyBool_FromLong(gcc_location_get_in_system_header(self->loc))',
                                   'Boolean: is this location within a system header?')
     cu.add_defn(getsettable.c_defn())
 
     methods = PyMethodTable('PyGccLocation_methods', [])
-    methods.add_method('offset_column',
-                       '(PyCFunction)PyGccLocation_offset_column',
-                       'METH_VARARGS',
-                       "")
+    if get_gcc_version() >= 5000:
+        methods.add_method('offset_column',
+                           '(PyCFunction)PyGccLocation_offset_column',
+                           'METH_VARARGS',
+                           "")
     cu.add_defn(methods.c_defn())
 
     pytype = PyGccWrapperTypeObject(identifier = 'PyGccLocation_TypeObj',
                           localname = 'Location',
                           tp_name = 'gcc.Location',
                           struct_name = 'PyGccLocation',
                           tp_new = 'PyType_GenericNew',
-                          tp_init = '(initproc)PyGccLocation_init',
+                          tp_init = '(initproc)PyGccLocation_init' if get_gcc_version() >= 7000 else None,
                           tp_getset = getsettable.identifier,
                           tp_hash = '(hashfunc)PyGccLocation_hash',
                           tp_repr = '(reprfunc)PyGccLocation_repr',
@@ -130,6 +131,12 @@ def generate_rich_location():
     #
     # Generate the gcc.RichLocation class:
     #
+
+    # class rich_location was added to libcpp in gcc 6.
+    GCC_VERSION = get_gcc_version()
+    if GCC_VERSION < 6000:
+        return
+
     global modinit_preinit
     global modinit_postinit