Commit: e3bdafe2bac1672da335fde734b337c5504e5437 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revisión: e3bdafe2bac1672da335fde734b337c5504e5437 (tree)
• Tiempo: 2015-10-29 21:55:01
• Autor: Pedro Alves <palves@redh...>
• Commiter: Pedro Alves

Log Message

compile: Rename struct type_map_instance::gcc_type field

Fixes:

src/gdb/compile/compile-c-types.c:36:12: error: declaration of ‘gcc_type type_map_instance::gcc_type’ [-fpermissive]

gcc_type gcc_type;

In file included from src/gdb/../include/gcc-c-interface.h:23:0,

from src/gdb/compile/compile-internal.h:21,
from src/gdb/compile/compile-c-types.c:23:

src/gdb/../include/gcc-interface.h:32:28: error: changes meaning of ‘gcc_type’ from ‘typedef long long unsigned int gcc_type’ [-fpermissive]

typedef unsigned long long gcc_type;

src/gdb/compile/compile-c-types.c: In function ‘gcc_type convert_qualified(compile_c_instance*, type*)’:
src/gdb/compile/compile-c-types.c:310:19: error: invalid conversion from ‘int’ to ‘gcc_qualifiers’ [-fpermissive]

quals);

gdb/ChangeLog:
2015-10-29 Pedro Alves <[e-mail]>

* compile/compile-c-types.c (struct type_map_instance)
<gcc_type>: Rename to gcc_type_handle.
(insert_type, convert_type): Adjust.

Cambiar Resumen

• modified: gdb/ChangeLog
• modified: gdb/compile/compile-c-types.c

Diferencia incremental

--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2015-10-29  Pedro Alves  <[e-mail]>
 
+	* compile/compile-c-types.c (struct type_map_instance)
+	<gcc_type>: Rename to gcc_type_handle.
+	(insert_type, convert_type): Adjust.
+
[phone]  Pedro Alves  <[e-mail]>
+
 	* dwarf2-frame-tailcall.c (dwarf2_tailcall_sniffer_first): Don't
 	assume that "break" breaks out of a TRY/CATCH.
 	* python/py-framefilter.c (py_print_single_arg): Don't assume

--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -31,7 +31,7 @@ struct type_map_instance
 
   /* The corresponding gcc type handle.  */
 
-  gcc_type gcc_type;
+  gcc_type gcc_type_handle;
 };
 
 /* Hash a type_map_instance.  */
@@ -72,13 +72,13 @@ insert_type (struct compile_c_instance *context, struct type *type,
   void **slot;
 
   inst.type = type;
-  inst.gcc_type = gcc_type;
+  inst.gcc_type_handle = gcc_type;
   slot = htab_find_slot (context->type_map, &inst, INSERT);
 
   add = (struct type_map_instance *) *slot;
   /* The type might have already been inserted in order to handle
      recursive types.  */
-  if (add != NULL && add->gcc_type != gcc_type)
+  if (add != NULL && add->gcc_type_handle != gcc_type)
     error (_("Unexpected type id from GCC, check you use recent enough GCC."));
 
   if (add == NULL)
@@ -388,7 +388,7 @@ convert_type (struct compile_c_instance *context, struct type *type)
   inst.type = type;
   found = (struct type_map_instance *) htab_find (context->type_map, &inst);
   if (found != NULL)
-    return found->gcc_type;
+    return found->gcc_type_handle;
 
   result = convert_type_basic (context, type);
   insert_type (context, type, result);