aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTrevor Saunders <tsaunders@mozilla.com>2014-12-10 03:45:40 +0000
committerTrevor Saunders <tbsaunde@gcc.gnu.org>2014-12-10 03:45:40 +0000
commit63f5d5b818319129217e41bcb23db53f99ff11b0 (patch)
treed68af710e723e37215793eba5a9d183e68b6f322 /include
parent59bce71381be24449aaf902bc1bc64a12b373bf4 (diff)
downloadgcc-63f5d5b818319129217e41bcb23db53f99ff11b0.zip
gcc-63f5d5b818319129217e41bcb23db53f99ff11b0.tar.gz
gcc-63f5d5b818319129217e41bcb23db53f99ff11b0.tar.bz2
remove gengtype support for param_is use_param, if_marked and splay tree allocators
gcc/ * plugin.c, plugin.def, ggc.h, ggc-common.c, gengtype.h, gengtype.c, gengtype-state.c, gengtype-parse.c, gentype-lex.l, gcc-plugin.h, doc/plugins.texi, doc/gty.texi: Remove support for if_marked and param_is. include/ * hashtab.h, splay-tree.h: Remove GTY markers. From-SVN: r218558
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog4
-rw-r--r--include/hashtab.h10
-rw-r--r--include/splay-tree.h20
3 files changed, 15 insertions, 19 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 632420c..f264b27 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-09 Trevor Saunders <tsaunders@mozilla.com>
+
+ * hashtab.h, splay-tree.h: Remove GTY markers.
+
2014-12-08 Mark Wielaard <mjw@redhat.com>
PR debug/60782
diff --git a/include/hashtab.h b/include/hashtab.h
index 4bb65d6..188b849 100644
--- a/include/hashtab.h
+++ b/include/hashtab.h
@@ -39,10 +39,6 @@ extern "C" {
#include "ansidecl.h"
-#ifndef GTY
-#define GTY(X)
-#endif
-
/* The type for a hash code. */
typedef unsigned int hashval_t;
@@ -97,7 +93,7 @@ typedef void (*htab_free_with_arg) (void *, void *);
functions mentioned below. The size of this structure is subject to
change. */
-struct GTY(()) htab {
+struct htab {
/* Pointer to hash function. */
htab_hash hash_f;
@@ -108,7 +104,7 @@ struct GTY(()) htab {
htab_del del_f;
/* Table itself. */
- void ** GTY ((use_param, length ("%h.size"))) entries;
+ void **entries;
/* Current size (in entries) of the hash table. */
size_t size;
@@ -132,7 +128,7 @@ struct GTY(()) htab {
htab_free free_f;
/* Alternate allocate/free functions, which take an extra argument. */
- void * GTY((skip)) alloc_arg;
+ void *alloc_arg;
htab_alloc_with_arg alloc_with_arg_f;
htab_free_with_arg free_with_arg_f;
diff --git a/include/splay-tree.h b/include/splay-tree.h
index a26135a..ec48a1f 100644
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -44,10 +44,6 @@ extern "C" {
#include <inttypes.h>
#endif
-#ifndef GTY
-#define GTY(X)
-#endif
-
/* Use typedefs for the key and data types to facilitate changing
these types, if necessary. These types should be sufficiently wide
that any pointer or scalar can be cast to these types, and then
@@ -86,22 +82,22 @@ typedef void *(*splay_tree_allocate_fn) (int, void *);
typedef void (*splay_tree_deallocate_fn) (void *, void *);
/* The nodes in the splay tree. */
-struct GTY(()) splay_tree_node_s {
+struct splay_tree_node_s {
/* The key. */
- splay_tree_key GTY ((use_param1)) key;
+ splay_tree_key key;
/* The value. */
- splay_tree_value GTY ((use_param2)) value;
+ splay_tree_value value;
/* The left and right children, respectively. */
- splay_tree_node GTY ((use_params)) left;
- splay_tree_node GTY ((use_params)) right;
+ splay_tree_node left;
+ splay_tree_node right;
};
/* The splay tree itself. */
-struct GTY(()) splay_tree_s {
+struct splay_tree_s {
/* The root of the tree. */
- splay_tree_node GTY ((use_params)) root;
+ splay_tree_node root;
/* The comparision function. */
splay_tree_compare_fn comp;
@@ -119,7 +115,7 @@ struct GTY(()) splay_tree_s {
splay_tree_deallocate_fn deallocate;
/* Parameter for allocate/free functions. */
- void * GTY((skip)) allocate_data;
+ void *allocate_data;
};
typedef struct splay_tree_s *splay_tree;