Package: odb / 2.4.0-5

GCC_6_port_part1.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
From 511dcf67322ad87fb32f97d1cf7725c129e83898 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 5 Feb 2016 16:01:42 +0200
Subject: [PATCH] Initial work to make ODB compatible with GCC 6

---
 odb/cxx-lexer.cxx          |    4 ++++
 odb/gcc-fwd.hxx            |   23 ++++++++++++++++++++++-
 odb/gcc.hxx                |   10 ++++++++++
 odb/include.cxx            |   31 +++++++++++++++++++++----------
 odb/parser.cxx             |    8 ++++----
 odb/plugin.cxx             |   29 +++++++++++++++++++++++++++--
 odb/semantics/elements.cxx |    4 ++--
 7 files changed, 90 insertions(+), 19 deletions(-)

diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx
index 7029c7e..64df296 100644
--- a/odb/cxx-lexer.cxx
+++ b/odb/cxx-lexer.cxx
@@ -135,8 +135,12 @@ cpp_error_callback (
 #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 5
   int /*reason*/, // Added in GCC 4.6.0.
 #endif
+#if BUILDING_GCC_MAJOR <= 5
   location_t,
   unsigned int,
+#else
+  rich_location*,
+#endif
   char const* msg,
   va_list *ap)
 {
diff --git a/odb/gcc-fwd.hxx b/odb/gcc-fwd.hxx
index a120f05..618b106 100644
--- a/odb/gcc-fwd.hxx
+++ b/odb/gcc-fwd.hxx
@@ -7,6 +7,24 @@
 
 #include <bversion.h>
 
+#if BUILDING_GCC_MAJOR >= 6
+
+// If we include <system.h> here, it pulls in all kinds of GCC trouble that
+// "poisons" standard C/C++ declarations; see safe-ctype.h. So instead we
+// are going to "exclude" safe-ctype.h. To compensate, however, we will
+// include it first thing in gcc.hxx.
+//
+#  include <config.h>
+#  define SAFE_CTYPE_H
+#  include <system.h>
+#  undef SAFE_CTYPE_H
+#  include <coretypes.h>
+
+typedef unsigned int source_location; // <line-map.h>
+typedef source_location location_t;   // <input.h>
+
+#else // GCC < 6
+
 #if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 8
 #  include <limits.h> // CHAR_BIT
 #  include <config.h>
@@ -33,6 +51,9 @@ extern "C"
 
 typedef unsigned int source_location; // <line-map.h>
 typedef source_location location_t;   // <input.h>
-}
+
+} // extern "C"
+
+#endif
 
 #endif // ODB_GCC_FWD_HXX
diff --git a/odb/gcc.hxx b/odb/gcc.hxx
index c953047..858d685 100644
--- a/odb/gcc.hxx
+++ b/odb/gcc.hxx
@@ -7,6 +7,10 @@
 
 #include <odb/gcc-fwd.hxx>
 
+#if BUILDING_GCC_MAJOR >= 6
+#  include <safe-ctype.h> // See gcc-fwd.hxx.
+#endif
+
 // GCC header includes to get the plugin and parse tree declarations.
 // The order is important and doesn't follow any kind of logic.
 //
@@ -145,4 +149,10 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];}
 #define DECL_CHAIN(x) TREE_CHAIN(x)
 #endif
 
+// In GCC 6, ANON_AGGRNAME_P became anon_aggrname_p().
+//
+#if BUILDING_GCC_MAJOR < 6
+#  define anon_aggrname_p(X) ANON_AGGRNAME_P(X)
+#endif
+
 #endif // ODB_GCC_HXX
diff --git a/odb/include.cxx b/odb/include.cxx
index 9c03f99..32d50a6 100644
--- a/odb/include.cxx
+++ b/odb/include.cxx
@@ -30,9 +30,18 @@ namespace
     path path_;
   };
 
+#if BUILDING_GCC_MAJOR >= 6
+  typedef line_map_ordinary line_map_type;
+#else
+  typedef line_map line_map_type;
+# ifndef linemap_check_ordinary
+#   define linemap_check_ordinary(X) (X)
+# endif
+#endif
+
   struct includes
   {
-    typedef std::map<line_map const*, include_directive> map_type;
+    typedef std::map<line_map_type const*, include_directive> map_type;
     bool trailing; // Included at the beginning or at the end of the main file.
     map_type map;
   };
@@ -144,7 +153,9 @@ namespace
       //
       if (l > BUILTINS_LOCATION)
       {
-        line_map const* lm (linemap_lookup (line_table, l));
+        line_map_type const* lm (
+          linemap_check_ordinary (
+            linemap_lookup (line_table, l)));
 
         if (lm != 0 && !MAIN_FILE_P (lm))
         {
@@ -537,20 +548,20 @@ namespace
     //
 #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6
     size_t used (line_table->used);
-    line_map const* maps (line_table->maps);
+    line_map_type const* maps (line_table->maps);
 #else
     size_t used (line_table->info_ordinary.used);
-    line_map const* maps (line_table->info_ordinary.maps);
+    line_map_type const* maps (line_table->info_ordinary.maps);
 #endif
 
     for (size_t i (0); i < used; ++i)
     {
-      line_map const* m (maps + i);
+      line_map_type const* m (maps + i);
 
       if (MAIN_FILE_P (m) || m->reason != LC_ENTER)
         continue;
 
-      line_map const* ifm (INCLUDED_FROM (line_table, m));
+      line_map_type const* ifm (INCLUDED_FROM (line_table, m));
 
 #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6
       path f (m->to_file);
@@ -580,7 +591,7 @@ namespace
       for (includes::iterator j (i->second.begin ());
            j != i->second.end (); ++j)
       {
-        line_map const* lm (j->first);
+        line_map_type const* lm (j->first);
         cerr << '\t' << lm->to_file << ":" << LAST_SOURCE_LINE (lm) << endl;
       }
       */
@@ -589,13 +600,13 @@ namespace
       // it is preferred over all others. Use the first one if there are
       // several.
       //
-      line_map const* main_lm (0);
+      line_map_type const* main_lm (0);
       include_directive* main_inc (0);
 
       for (includes::map_type::iterator j (i->second.map.begin ());
            j != i->second.map.end (); ++j)
       {
-        line_map const* lm (j->first);
+        line_map_type const* lm (j->first);
 
         if (MAIN_FILE_P (lm))
         {
@@ -636,7 +647,7 @@ namespace
       for (includes::map_type::iterator j (i->second.map.begin ());
            j != i->second.map.end (); ++j)
       {
-        line_map const* lm (j->first);
+        line_map_type const* lm (j->first);
 
 #if BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR <= 6
         string f (lm->to_file);
diff --git a/odb/parser.cxx b/odb/parser.cxx
index 275da33..842611f 100644
--- a/odb/parser.cxx
+++ b/odb/parser.cxx
@@ -1044,14 +1044,14 @@ emit_type_decl (tree decl)
     // says that in typedef struct {} S; S becomes struct's
     // name.
     //
-    if (ANON_AGGRNAME_P (decl_name))
+    if (anon_aggrname_p (decl_name))
     {
       tree d (TYPE_NAME (t));
 
       if (d != NULL_TREE &&
           !DECL_ARTIFICIAL (d) &&
           DECL_NAME (d) != NULL_TREE &&
-          !ANON_AGGRNAME_P (DECL_NAME (d)))
+          !anon_aggrname_p (DECL_NAME (d)))
       {
         decl = d;
         decl_name = DECL_NAME (decl);
@@ -1668,7 +1668,7 @@ create_type (tree t,
             ts << "start anon/stub " << gcc_tree_code_name(tc) << " at "
                << file << ":" << line << endl;
 
-          if (d == NULL_TREE || ANON_AGGRNAME_P (DECL_NAME (d)))
+          if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d)))
           {
             if (tc == RECORD_TYPE)
               r = &emit_class<class_> (t, file, line, clmn);
@@ -1765,7 +1765,7 @@ create_type (tree t,
         ts << "start anon/stub " << gcc_tree_code_name(tc) << " at "
            << file << ":" << line << endl;
 
-      if (d == NULL_TREE || ANON_AGGRNAME_P (DECL_NAME (d)))
+      if (d == NULL_TREE || anon_aggrname_p (DECL_NAME (d)))
       {
         r = &emit_enum (t, access, file, line, clmn);
       }
diff --git a/odb/plugin.cxx b/odb/plugin.cxx
index fbbfe46..bc98f3e 100644
--- a/odb/plugin.cxx
+++ b/odb/plugin.cxx
@@ -45,14 +45,28 @@ path file_;    // File being compiled.
 paths inputs_; // List of input files in at-once mode or just file_.
 
 bool (*cpp_error_prev) (
-  cpp_reader*, int, int, location_t, unsigned int, const char*, va_list*);
+  cpp_reader*,
+  int,
+  int,
+#if BUILDING_GCC_MAJOR >= 6
+  rich_location*,
+#else
+  location_t,
+  unsigned int,
+#endif
+  const char*,
+  va_list*);
 
 static bool
 cpp_error_filter (cpp_reader* r,
                   int level,
                   int reason,
+#if BUILDING_GCC_MAJOR >= 6
+                  rich_location* l,
+#else
                   location_t l,
                   unsigned int column_override,
+#endif
                   const char* msg,
                   va_list* ap)
 {
@@ -66,7 +80,18 @@ cpp_error_filter (cpp_reader* r,
   if (strstr (msg, "#pragma once") != 0)
     return true;
 
-  return cpp_error_prev (r, level, reason, l, column_override, msg, ap);
+  return cpp_error_prev (
+    r,
+    level,
+    reason,
+#if BUILDING_GCC_MAJOR >= 6
+    l,
+#else
+    l,
+    column_override,
+#endif
+    msg,
+    ap);
 }
 
 // A prefix of the _cpp_file struct. This struct is not part of the
diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx
index 43fb379..ae9e906 100644
--- a/odb/semantics/elements.cxx
+++ b/odb/semantics/elements.cxx
@@ -59,7 +59,7 @@ namespace semantics
       if (tree decl = TYPE_NAME (n))
         name = DECL_NAME (decl);
 
-      return name != 0 && ANON_AGGRNAME_P (name);
+      return name != 0 && anon_aggrname_p (name);
     }
 
     return true;
@@ -108,7 +108,7 @@ namespace semantics
       if (tree decl = TYPE_NAME (type))
       {
         name = DECL_NAME (decl);
-        if (name != 0 && ANON_AGGRNAME_P (name))
+        if (name != 0 && anon_aggrname_p (name))
           return true;
 
         tree s (CP_DECL_CONTEXT (decl));
-- 
1.7.10.4